Merge branch 'main' into update-dev-dependencies

sitespeedio · Jul 16, 2023 · c3ca017 · c3ca017
2 parents a49f60c + 1856304
commit c3ca017
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml
@@ -42,15 +42,15 @@ jobs:
       run: |
         IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')
         xcrun simctl boot $IPHONE14
-    - name: Start local HTTP server
-      run: (npm run start-server&)
+    #- name: Start local HTTP server
+    # run: (npm run start-server&)
     - name: Test Safari without video 
-      run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/
-    #- name: Test Safari iOS simulator 
-    #  run: |
-    #    IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')
-    #    ./bin/browsertime.js -b safari -n 1 --safari.useSimulator --video --visualMetrics --safari.deviceUDID $IPHONE14 https://www.sitespeed.io/
-    - name: Test Safari with video and Visual Metrics
-      run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics http://127.0.0.1:3000/simple/
-    - name: Test Safari with video and Visual Metrics for multi pages
-      run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics test/data/navigationscript/multi.cjs
+      run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/
+    - name: Test Safari iOS simulator 
+      run: |
+        IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')
+        ./bin/browsertime.js -b safari -n 1 --safari.useSimulator --video --visualMetrics --safari.deviceUDID $IPHONE14 https://www.sitespeed.io/
+    #- name: Test Safari with video and Visual Metrics
+    #  run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics https://www.sitespeed.io/
+    #- name: Test Safari with video and Visual Metrics for multi pages
+    #  run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics test/data/navigationscript/multiMac.cjs
diff --git a/test/data/navigationscript/multiMac.cjs b/test/data/navigationscript/multiMac.cjs
@@ -0,0 +1,4 @@
+module.exports = async function (context, commands) {
+  await commands.measure.start('https://www.sitespeed.io');
+  return commands.measure.start('https://www.sitespeed.io/documentation/');
+};