Skip to content

Commit fd54812

Browse files
committed
Merge branch 'development'
* development: Fix #865 Change .swift-version Fix documentation
2 parents b6a8984 + 0594376 commit fd54812

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.0.2

Source/SocketIO/Manager/SocketManager.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import Foundation
4646
open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDataBufferable, ConfigSettable {
4747
private static let logType = "SocketManager"
4848

49-
// MARK Properties
49+
// MARK: Properties
5050

5151
/// The socket associated with the default namespace ("/").
5252
public var defaultSocket: SocketIOClient {
@@ -125,6 +125,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
125125
private var currentReconnectAttempt = 0
126126
private var reconnecting = false
127127

128+
// MARK: Initializers
129+
128130
/// Type safe way to create a new SocketIOClient. `opts` can be omitted.
129131
///
130132
/// - parameter socketURL: The url of the socket.io server.
@@ -461,6 +463,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
461463
switch option {
462464
case let .forceNew(new):
463465
self.forceNew = new
466+
case let .handleQueue(queue):
467+
self.handleQueue = queue
464468
case let .reconnects(reconnects):
465469
self.reconnects = reconnects
466470
case let .reconnectWait(wait):

Tests/TestSocketIO/SocketMangerTest.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,22 @@ class SocketMangerTest : XCTestCase {
7272
waitForExpectations(timeout: 0.3)
7373
}
7474

75+
func testManagerSetsConfigs() {
76+
let queue = DispatchQueue(label: "testQueue")
77+
78+
manager = TestManager(socketURL: URL(string: "http://localhost/")!, config: [
79+
.handleQueue(queue),
80+
.forceNew(true),
81+
.reconnects(false),
82+
.reconnectWait(5)
83+
])
84+
85+
XCTAssertEqual(manager.handleQueue, queue)
86+
XCTAssertTrue(manager.forceNew)
87+
XCTAssertFalse(manager.reconnects)
88+
XCTAssertEqual(manager.reconnectWait, 5)
89+
}
90+
7591
private func setUpSockets() {
7692
socket = manager.testSocket(forNamespace: "/")
7793
socket2 = manager.testSocket(forNamespace: "/swift")

0 commit comments

Comments
 (0)