Get web view's URL at runtime

.github/workflows/run_tests.yml

@@ -4,24 +4,23 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-on: 
+on:
   push:
     branches:
     - main
   pull_request:
 
-env:
-  XCODEBUILD_DESTINATION_IOS: 'platform=iOS Simulator,name=iPhone 14 Pro'
-
 jobs:
   build-and-test:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode_14.2.app && /usr/bin/xcodebuild -version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
 
       - name: Run Tests
-        run: xcodebuild test -project Strada.xcodeproj -scheme Strada -destination "${{ env.XCODEBUILD_DESTINATION_IOS }}" -resultBundlePath TestResults
+        run: xcodebuild test -scheme Strada -destination "name=iPhone 15 Pro" | xcpretty && exit ${PIPESTATUS[0]}

Source/BridgeDelegate.swift

@@ -117,7 +117,7 @@ public final class BridgeDelegate: BridgingDelegate {
     @discardableResult
     public func bridgeDidReceiveMessage(_ message: Message) -> Bool {
         guard destinationIsActive,
-              location == message.metadata?.url else {
+              webView?.url?.absoluteString ?? location == message.metadata?.url else {
             logger.warning("bridgeDidIgnoreMessage: \(String(describing: message))")
             return false
         }

Tests/MessageTests.swift

@@ -184,7 +184,7 @@ class MessageTests: XCTestCase {
 
     // MARK: Custom encoding
 
-    func test_encodingWithCustomEncoder() {
+    func test_encodingWithCustomEncoder() throws {
         let encoder = JSONEncoder()
         encoder.keyEncodingStrategy = .convertToSnakeCase
         Strada.config.jsonEncoder = encoder
@@ -204,6 +204,15 @@ class MessageTests: XCTestCase {
 
         let newMessage = message.replacing(data: messageData)
 
-        XCTAssertEqual(message, newMessage)
+        XCTAssertEqual(message.id, newMessage.id)
+        XCTAssertEqual(message.event, newMessage.event)
+        XCTAssertEqual(message.metadata, newMessage.metadata)
+
+        // JSON as a string might have keys in a different order. Parse values to ensure equality.
+        let newMessageData = try XCTUnwrap(message.jsonData.jsonObject() as? [String: String])
+        XCTAssertEqual(newMessageData.keys.count, 3)
+        XCTAssertEqual(newMessageData["title"], "Page-title")
+        XCTAssertEqual(newMessageData["subtitle"], "Page-subtitle")
+        XCTAssertEqual(newMessageData["action_name"], "go")
     }
 }