test: fix realtime tests

Author: grdsdev

Sources/Realtime/RealtimeClientV2.swift

@@ -562,7 +562,7 @@ public final class RealtimeClientV2: RealtimeClientProtocol {
     return url
   }
 
-  var broadcastURL: URL {
+  nonisolated var broadcastURL: URL {
     url.appendingPathComponent("api/broadcast")
   }
 }

Tests/RealtimeTests/RealtimeChannelTests.swift

@@ -12,6 +12,7 @@ import XCTestDynamicOverlay
 
 @testable import Realtime
 
+@MainActor
 final class RealtimeChannelTests: XCTestCase {
   let sut = RealtimeChannelV2(
     topic: "topic",

Tests/RealtimeTests/RealtimeTests.swift

@@ -11,6 +11,7 @@ import XCTest
   import FoundationNetworking
 #endif
 
+@MainActor
 final class RealtimeTests: XCTestCase {
   let url = URL(string: "http://localhost:54321/realtime/v1")!
   let apiKey = "anon.api.key"
@@ -33,8 +34,8 @@ final class RealtimeTests: XCTestCase {
   let reconnectDelay: TimeInterval = RealtimeClientOptions.defaultReconnectDelay
   let timeoutInterval: TimeInterval = RealtimeClientOptions.defaultTimeoutInterval
 
-  override func setUp() {
-    super.setUp()
+  override func setUp() async throws {
+    try await super.setUp()
 
     (client, server) = FakeWebSocket.fakes()
     http = HTTPClientMock()
@@ -54,10 +55,10 @@ final class RealtimeTests: XCTestCase {
     )
   }
 
-  override func tearDown() {
+  override func tearDown() async throws {
     sut.disconnect()
 
-    super.tearDown()
+    try await super.tearDown()
   }
 
   func test_transport() async {
@@ -128,10 +129,10 @@ final class RealtimeTests: XCTestCase {
 
     XCTAssertEqual(socketStatuses.value, [.disconnected, .connecting, .connected])
 
-    let messageTask = sut.mutableState.messageTask
+    let messageTask = sut.messageTask
     XCTAssertNotNil(messageTask)
 
-    let heartbeatTask = sut.mutableState.heartbeatTask
+    let heartbeatTask = sut.heartbeatTask
     XCTAssertNotNil(heartbeatTask)
 
     let channelStatuses = LockIsolated([RealtimeChannelStatus]())
@@ -247,15 +248,22 @@ final class RealtimeTests: XCTestCase {
     // So we need to wait at least 2.5s to ensure the retry happens
     await testClock.advance(by: .seconds(2.5))
 
-    let events = client.sentEvents.compactMap { $0.realtimeMessage }.filter {
-      $0.event == "phx_join"
-    }
-    assertInlineSnapshot(of: events, as: .json) {
+    let events = client.sentEvents.compactMap { $0.realtimeMessage }
+
+    assertInlineSnapshot(of: events, as: .json, record: .failed) {
       #"""
       [
+        {
+          "event" : "heartbeat",
+          "payload" : {
+
+          },
+          "ref" : "1",
+          "topic" : "phoenix"
+        },
         {
           "event" : "phx_join",
-          "join_ref" : "1",
+          "join_ref" : "2",
           "payload" : {
             "access_token" : "custom.access.token",
             "config" : {
@@ -274,12 +282,12 @@ final class RealtimeTests: XCTestCase {
             },
             "version" : "realtime-swift\/0.0.0"
           },
-          "ref" : "1",
+          "ref" : "2",
           "topic" : "realtime:public:messages"
         },
         {
           "event" : "phx_join",
-          "join_ref" : "2",
+          "join_ref" : "3",
           "payload" : {
             "access_token" : "custom.access.token",
             "config" : {
@@ -298,7 +306,7 @@ final class RealtimeTests: XCTestCase {
             },
             "version" : "realtime-swift\/0.0.0"
           },
-          "ref" : "2",
+          "ref" : "3",
           "topic" : "realtime:public:messages"
         }
       ]
@@ -524,7 +532,7 @@ final class RealtimeTests: XCTestCase {
 
     await fulfillment(of: [sentHeartbeatExpectation], timeout: 0)
 
-    let pendingHeartbeatRef = sut.mutableState.pendingHeartbeatRef
+    let pendingHeartbeatRef = sut.pendingHeartbeatRef
     XCTAssertNotNil(pendingHeartbeatRef)
 
     // Wait until next heartbeat
@@ -614,7 +622,7 @@ final class RealtimeTests: XCTestCase {
       "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjY0MDkyMjExMjAwfQ.GfiEKLl36X8YWcatHg31jRbilovlGecfUKnOyXMSX9c"
     await sut.setAuth(validToken)
 
-    XCTAssertEqual(sut.mutableState.accessToken, validToken)
+    XCTAssertEqual(sut.accessToken, validToken)
   }
 
   func testSetAuthWithNonJWT() async throws {

Tests/RealtimeTests/_PushTests.swift

@@ -12,12 +12,13 @@ import XCTest
 @testable import Realtime
 
 #if !os(Android) && !os(Linux) && !os(Windows)
+  @MainActor
   final class _PushTests: XCTestCase {
     var ws: FakeWebSocket!
     var socket: RealtimeClientV2!
 
-    override func setUp() {
-      super.setUp()
+    override func setUp() async throws {
+      try await super.setUp()
 
       let (client, server) = FakeWebSocket.fakes()
       ws = server
@@ -43,7 +44,7 @@ import XCTest
         socket: socket,
         logger: nil
       )
-      let push = await PushV2(
+      let push = PushV2(
         channel: channel,
         message: RealtimeMessageV2(
           joinRef: nil,
@@ -69,7 +70,7 @@ import XCTest
         socket: socket,
         logger: nil
       )
-      let push = await PushV2(
+      let push = PushV2(
         channel: channel,
         message: RealtimeMessageV2(
           joinRef: nil,
@@ -84,7 +85,7 @@ import XCTest
         await push.send()
       }
       await Task.megaYield()
-      await push.didReceive(status: .ok)
+      push.didReceive(status: .ok)
 
       let status = await task.value
       XCTAssertEqual(status, .ok)

Tests/SupabaseTests/SupabaseClientTests.swift

@@ -86,10 +86,10 @@ final class SupabaseClientTests: XCTestCase {
     let functionsRegion = await client.functions.region
     XCTAssertEqual(functionsRegion?.rawValue, "ap-northeast-1")
 
-    let realtimeURL = client.realtimeV2.url
+    let realtimeURL = await client.realtimeV2.url
     XCTAssertEqual(realtimeURL.absoluteString, "https://project-ref.supabase.co/realtime/v1")
 
-    let realtimeOptions = client.realtimeV2.options
+    let realtimeOptions = await client.realtimeV2.options
     let expectedRealtimeHeader = client._headers.merging(with: [
       .init("custom_realtime_header_key")!: "custom_realtime_header_value"
     ]