Merge branch 'development'

* development:
  more test restructuring
  Restructure tests
  Add test for socketio#829

Author: nuclearace

.travis.yml

@@ -15,4 +15,4 @@ script:
   - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -quiet
 #  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet
 #  - xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac run-tests --parallelize
-  - swift build
+  - swift test

Package.swift

@@ -11,6 +11,7 @@ let package = Package(
         .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "2.1.1")),
     ],
     targets: [
-        .target(name: "SocketIO", dependencies: ["Starscream"])
+        .target(name: "SocketIO", dependencies: ["Starscream"]),
+        .testTarget(name: "TestSocketIO", dependencies: ["SocketIO"]),
     ]
 )

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

@@ -387,6 +387,24 @@ class SocketSideEffectTest: XCTestCase {
         XCTAssertEqual(socket.nsp, "/test", "It should set the namespace after creation")
     }
 
+    func testSettingExtraHeadersAfterInit() {
+        socket.setTestStatus(.notConnected)
+        socket.config = [.extraHeaders(["new": "value"])]
+        socket.config.insert(.extraHeaders(["hello": "world"]), replacing: true)
+
+        for config in socket.config {
+            switch config {
+            case let .extraHeaders(headers):
+                XCTAssertTrue(headers.keys.contains("hello"), "It should contain hello header key")
+                XCTAssertFalse(headers.keys.contains("new"), "It should not contain old data")
+            case .path:
+                continue
+            default:
+                XCTFail("It should only have two configs")
+            }
+        }
+    }
+
     func testSettingConfigAfterInitWhenConnectedIgnoresChanges() {
         socket.config = [.log(true), .nsp("/test")]