Merge remote-tracking branch 'origin/master' into development
* origin/master: Fix Starscream to version 4.0.4 Remove unused var in SocketAckManagerTest.testManagerTimeoutAck
This commit is contained in:
		
						commit
						2058eba1fb
					
				@ -8,7 +8,7 @@ let package = Package(
 | 
			
		||||
        .library(name: "SocketIO", targets: ["SocketIO"])
 | 
			
		||||
    ],
 | 
			
		||||
    dependencies: [
 | 
			
		||||
        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.0")),
 | 
			
		||||
        .package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.4")),
 | 
			
		||||
    ],
 | 
			
		||||
    targets: [
 | 
			
		||||
        .target(name: "SocketIO", dependencies: ["Starscream"]),
 | 
			
		||||
 | 
			
		||||
@ -28,7 +28,6 @@ class SocketAckManagerTest : XCTestCase {
 | 
			
		||||
 | 
			
		||||
    func testManagerTimeoutAck() {
 | 
			
		||||
        let callbackExpection = expectation(description: "Manager should timeout ack with noAck status")
 | 
			
		||||
        let itemsArray = ["Hi", "ho"]
 | 
			
		||||
 | 
			
		||||
        func callback(_ items: [Any]) {
 | 
			
		||||
            XCTAssertEqual(items.count, 1, "Timed out ack should have one value")
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user