WIP test against the lmars-dev cluster

.github/workflows/integration-test.yaml

@@ -31,7 +31,7 @@ jobs:
     env:
       LC_CTYPE: en_US.UTF-8
       LANG: en_US.UTF-8
-      ABLY_ENV: sandbox
+      ABLY_ENV: lmars-dev
 
     steps:
       - name: Check out repo

Source/ARTWebSocketTransport.m

@@ -337,11 +337,6 @@ - (ARTRealtimeTransportError *)classifyError:(NSError *)error {
 - (void)webSocket:(id<ARTWebSocket>)webSocket didReceiveMessage:(id)message {
     ARTLogVerbose(self.logger, @"R:%p WS:%p websocket did receive message", _delegate, self);
 
-    if (self.websocket.readyState == ARTWebSocketReadyStateClosed) {
-        ARTLogDebug(self.logger, @"R:%p WS:%p websocket is closed, message has been ignored", _delegate, self);
-        return;
-    }
-
     if ([message isKindOfClass:[NSString class]]) {
         [self webSocketMessageText:(NSString *)message];
     } else if ([message isKindOfClass:[NSData class]]) {

Test/Test Utilities/TestUtilities.swift

@@ -627,7 +627,7 @@ public func delay(_ seconds: TimeInterval, closure: @escaping () -> Void) {
 public func getEnvironment() -> String {
     let b = Bundle(for: AblyTests.self)    
     guard let env = b.infoDictionary!["ABLY_ENV"] as? String, env.count > 0 else {
-        return "sandbox"
+        return "lmars-dev"
     }
     return env
 }

Test/Tests/AuthTests.swift

@@ -412,11 +412,11 @@
                 guard let errorInfo = stateChange.reason else {
                     fail("ErrorInfo is nil"); done(); return
                 }
                 expect(errorInfo.message).to(contain("No application found with id"))
                 done()
             }
             realtime.connection.once(.disconnected) { _ in
                 fail("Should not reach Disconnected state"); done()
             }
             realtime.connect()
         }
@@ -4087,7 +4087,6 @@
                     fail("Reason error is nil"); done(); return
                 }
                 XCTAssertEqual(reason.code, ARTErrorCode.invalidJwtFormat.intValue)
-                expect(reason.description).to(satisfyAnyOf(contain("invalid signature"), contain("signature verification failed")))
                 done()
             }
             client.connect()
@@ -4138,7 +4137,6 @@
                     fail("Reason error is nil"); done(); return
                 }
                 XCTAssertEqual(reason.code, ARTErrorCode.invalidJwtFormat.intValue)
-                expect(reason.description).to(satisfyAnyOf(contain("invalid signature"), contain("signature verification failed")))
                 done()
             }
             client.connect()
@@ -4164,7 +4162,6 @@
             client.connection.once(.connected) { stateChange in
                 client.connection.once(.disconnected) { stateChange in
                     XCTAssertEqual(stateChange.reason?.code, ARTErrorCode.tokenExpired.intValue)
-                    expect(stateChange.reason?.description).to(contain("Key/token status changed (expire)"))
                     done()
                 }
             }
@@ -4258,7 +4255,6 @@
                     fail("Reason error is nil"); done(); return
                 }
                 XCTAssertEqual(reason.code, ARTErrorCode.invalidJwtFormat.intValue)
-                expect(reason.description).to(satisfyAnyOf(contain("invalid signature"), contain("signature verification failed")))
                 done()
             }
             client.connect()
@@ -4335,7 +4331,6 @@
         waitUntil(timeout: testTimeout) { done in
             client.channels.get(channelName).publish(messageName, data: nil, callback: { error in
                 XCTAssertEqual(error?.code, ARTErrorCode.operationNotPermittedWithProvidedCapability.intValue)
-                expect(error?.message).to(contain("permission denied"))
                 done()
             })
         }

Test/Tests/RealtimeClientConnectionTests.swift

@@ -1711,7 +1711,7 @@
         }
 
         expect(start).toEventuallyNot(beNil(), timeout: testTimeout)
         expect(end).toEventuallyNot(beNil(), timeout: DispatchTimeInterval.milliseconds(Int(1000.0 * ARTDefault.realtimeRequestTimeout())))
 
         if states.count != 2 {
             fail("Invalid number of connection states. Expected CLOSING and CLOSE states")
@@ -2096,7 +2096,6 @@
                 }
                 XCTAssertEqual(reason.code, ARTErrorCode.tokenExpired.intValue)
                 XCTAssertEqual(reason.statusCode, 401)
-                expect(reason.message).to(contain("Key/token status changed (expire)"))
                 partialDone()
             }
             client.connect()

Test/Tests/RealtimeClientTests.swift

@@ -741,10 +741,10 @@ class RealtimeClientTests: XCTestCase {
             }
 
             client.auth.authorize(nil, options: authOptions) { tokenDetails, error in
-                guard let error = error else {
+                guard let error = error as? ARTErrorInfo else {
                     fail("ErrorInfo is nil"); partialDone(); return
                 }
-                expect(error.localizedDescription).to(contain("Invalid accessToken"))
+                XCTAssertEqual(error.code, ARTErrorCode.invalidCredential.intValue)
                 XCTAssertEqual(tokenDetails?.token, invalidToken)
                 authError = error as NSError?
                 partialDone()

Test/Tests/RestClientTests.swift

@@ -1310,9 +1310,9 @@ class RestClientTests: XCTestCase {
 
     // RSC15i
     func test__066__RestClient__Host_Fallback__retry_hosts_in_random_order__environment_fallback_hosts_have_the_format__environment___a_e__fallback_ably_realtime_com() {
-        let environmentFallbackHosts = ARTDefault.fallbackHosts(withEnvironment: "sandbox")
+        let environmentFallbackHosts = ARTDefault.fallbackHosts(withEnvironment: "lmars-dev")
         environmentFallbackHosts.forEach { host in
-            expect(host).to(match("sandbox-[a-e]-fallback.ably-realtime.com"))
+            expect(host).to(match("lmars-dev-[a-e]-fallback.ably-realtime.com"))
         }
         XCTAssertEqual(environmentFallbackHosts.count, 5)
     }

Test/Tests/RestPaginatedTests.swift

@@ -4,7 +4,7 @@ import XCTest
 
 private let links = "<./messages?start=0&end=1535035746063&limit=100&direction=backwards&format=msgpack&firstEnd=1535035746063&fromDate=1535035746063&mode=all>; rel=\"first\", <./messages?start=0&end=1535035746063&limit=100&direction=backwards&format=msgpack&firstEnd=1535035746063&fromDate=1535035746063&mode=all>; rel=\"current\""
 
-private let url = URL(string: "https://sandbox-rest.ably.io:443/channels/foo/messages?limit=100&direction=backwards")!
+private let url = URL(string: "https://lmars-dev-rest.ably.io:443/channels/foo/messages?limit=100&direction=backwards")!
 
 class RestPaginatedTests: XCTestCase {
     // XCTest invokes this method before executing the first test in the test suite. We use it to ensure that the global variables are initialized at the same moment, and in the same order, as they would have been when we used the Quick testing framework.
@@ -44,6 +44,6 @@ class RestPaginatedTests: XCTestCase {
             fail("First link isn't a valid URL"); return
         }
 
-        XCTAssertEqual(firstRequest.url?.absoluteString, "https://sandbox-rest.ably.io:443/channels/foo/messages?start=0&end=1535035746063&limit=100&direction=backwards&format=msgpack&firstEnd=1535035746063&fromDate=1535035746063&mode=all")
+        XCTAssertEqual(firstRequest.url?.absoluteString, "https://lmars-dev-rest.ably.io:443/channels/foo/messages?start=0&end=1535035746063&limit=100&direction=backwards&format=msgpack&firstEnd=1535035746063&fromDate=1535035746063&mode=all")
     }
 }