Merge branch 'master' into atoms-15247

Author: KazuCocoa

.github/workflows/functional-test.yml

@@ -11,14 +11,11 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: macos-14
-          xcode: '15.2'
-          ios: '17.2'
-          device: iPhone 15
-        - os: macos-13
-          xcode: '14.3.1'
-          ios: '16.4'
-          device: iPhone 14
+        - os: macos-15
+          xcode: '16.2'
+          ios: '18.2'
+          device: iPhone 16
+      fail-fast: false
     runs-on: ${{ matrix.os }}
     env:
       PLATFORM_VERSION: ${{ matrix.ios }}
@@ -31,18 +28,20 @@ jobs:
     - uses: actions/checkout@v3
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: ${{ env.XCODE_VERSION }}
+        xcode-version: ${{ matrix.xcode }}
     - run: xcrun simctl list
     - uses: actions/setup-node@v3
       with:
         node-version: lts/*
         check-latest: true
     - name: Prepare iOS simulator
-      run: |
-        open -Fn "$(xcode-select -p)/Applications/Simulator.app"
-        udid=$(xcrun simctl list devices available -j | \
-          node -p "Object.entries(JSON.parse(fs.readFileSync(0)).devices).filter((x) => x[0].includes('$PLATFORM_VERSION'.replace('.', '-'))).reduce((acc, x) => [...acc, ...x[1]], []).find(({name}) => name === '$DEVICE_NAME').udid")
-        xcrun simctl bootstatus $udid -b
-        xcrun simctl openurl $udid "https://google.com" &
+      id: prepareSimulator
+      uses: futureware-tech/simulator-action@v4
+      with:
+        model: "${{ matrix.device }}"
+        os_version: "${{ matrix.ios }}"
+        shutdown_after_job: false
+        wait_for_boot: true
+    - run: xcrun simctl openurl booted "https://google.com" &
     - run: npm install
     - run: npm run e2e-test

test/functional/safari-e2e-specs.js

@@ -58,7 +58,7 @@ describe('Safari remote debugger', function () {
     await sim.run({
       startupTimeout: process.env.CI ? 600000 : 120000,
     });
-    address = `http://localhost:${await portPromise}`;
+    address = `http://127.0.0.1:${await portPromise}`;
   });
   after(async function () {
     await sim.shutdown();