Merge branch 'development'

* development:
  Fix #865
  Change .swift-version
  Fix documentation
This commit is contained in:
Erik Little 2017-11-14 07:19:58 -05:00
commit fd548121c2
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
3 changed files with 22 additions and 2 deletions

View File

@ -1 +1 @@
4.0 4.0.2

View File

@ -46,7 +46,7 @@ import Foundation
open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDataBufferable, ConfigSettable { open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDataBufferable, ConfigSettable {
private static let logType = "SocketManager" private static let logType = "SocketManager"
// MARK Properties // MARK: Properties
/// The socket associated with the default namespace ("/"). /// The socket associated with the default namespace ("/").
public var defaultSocket: SocketIOClient { public var defaultSocket: SocketIOClient {
@ -125,6 +125,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
private var currentReconnectAttempt = 0 private var currentReconnectAttempt = 0
private var reconnecting = false private var reconnecting = false
// MARK: Initializers
/// Type safe way to create a new SocketIOClient. `opts` can be omitted. /// Type safe way to create a new SocketIOClient. `opts` can be omitted.
/// ///
/// - parameter socketURL: The url of the socket.io server. /// - parameter socketURL: The url of the socket.io server.
@ -461,6 +463,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
switch option { switch option {
case let .forceNew(new): case let .forceNew(new):
self.forceNew = new self.forceNew = new
case let .handleQueue(queue):
self.handleQueue = queue
case let .reconnects(reconnects): case let .reconnects(reconnects):
self.reconnects = reconnects self.reconnects = reconnects
case let .reconnectWait(wait): case let .reconnectWait(wait):

View File

@ -72,6 +72,22 @@ class SocketMangerTest : XCTestCase {
waitForExpectations(timeout: 0.3) waitForExpectations(timeout: 0.3)
} }
func testManagerSetsConfigs() {
let queue = DispatchQueue(label: "testQueue")
manager = TestManager(socketURL: URL(string: "http://localhost/")!, config: [
.handleQueue(queue),
.forceNew(true),
.reconnects(false),
.reconnectWait(5)
])
XCTAssertEqual(manager.handleQueue, queue)
XCTAssertTrue(manager.forceNew)
XCTAssertFalse(manager.reconnects)
XCTAssertEqual(manager.reconnectWait, 5)
}
private func setUpSockets() { private func setUpSockets() {
socket = manager.testSocket(forNamespace: "/") socket = manager.testSocket(forNamespace: "/")
socket2 = manager.testSocket(forNamespace: "/swift") socket2 = manager.testSocket(forNamespace: "/swift")