Attempt to fix mac tests

.github/workflows/build.yml

@@ -15,6 +15,7 @@ jobs:
   build_tip_of_tree_v12:
     name: Build test (against tip-of-tree core develop)
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: Checkout experimentation plugin
         uses: actions/checkout@v4
@@ -59,8 +60,7 @@ jobs:
 
   build:
     name: Build test (against pinned v12)
-    # Don't run pinned version checks for PRs.
-    if: ${{ !github.base_ref }}
+    if: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout experimentation plugin
@@ -81,6 +81,7 @@ jobs:
     name: Eslint check
     timeout-minutes: 5
     runs-on: ubuntu-latest
+    if: false
     steps:
       - uses: actions/checkout@v4
 
@@ -99,6 +100,7 @@ jobs:
     name: Prettier check
     timeout-minutes: 5
     runs-on: ubuntu-latest
+    if: false
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/test.yml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   webdriverio_tests_tip_of_tree_v12:
     name: WebdriverIO tests (against tip-of-tree core develop)
-    timeout-minutes: 10
+    # timeout-minutes: 10
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'google/blockly'
-          ref: 'develop'
+          ref: 'main'
           path: core-blockly
 
       - name: Use Node.js 20.x
@@ -60,15 +60,30 @@ jobs:
           npm link blockly
           cd ..
 
-      - name: Run tests
+      - name: Build tests
+        run: |
+          cd main
+          npm run wdio:clean
+
+      - name: Run tests (up to 50 times)
         run: |
           cd main
-          npm run test:ci
+          for i in $(seq 1 50);
+          do
+            echo "Attempt $i"
+            npm run wdio:run:ci
+          done
+
+      - name: Upload test failure screenshots
+        if: always()
+        uses: actions/upload-artifact@v5
+        with:
+          name: test-failure-screenshots
+          path: main/test/webdriverio/test/failures
 
   webdriverio_tests:
     name: WebdriverIO tests (against pinned v12)
-    # Don't run pinned version checks for PRs.
-    if: ${{ !github.base_ref }}
+    if: false
     timeout-minutes: 10
     runs-on: ${{ matrix.os }}
 

package.json

@@ -15,16 +15,16 @@
     "prepublishOnly": "npm login --registry https://wombat-dressing-room.appspot.com",
     "start": "blockly-scripts start",
     "test": "npm run test:mocha && npm run test:wdio",
-    "test:ci": "npm run test:mocha && npm run test:wdio:ci",
+    "test:ci": "npm run test:wdio:ci",
     "test:mocha": "blockly-scripts test",
     "test:wdio": "npm run wdio:clean && npm run wdio:run",
     "test:wdio:ci": "npm run wdio:clean && npm run wdio:run:ci",
     "wdio:build": "npm run wdio:build:app && npm run wdio:build:tests",
     "wdio:build:app": "cd test/webdriverio && webpack",
     "wdio:build:tests": "tsc -p ./test/webdriverio/test/tsconfig.json",
-    "wdio:clean": "cd test/webdriverio/test && rm -rf dist",
-    "wdio:run": "npm run wdio:build && cd test/webdriverio/test && npx mocha dist",
-    "wdio:run:ci": "npm run wdio:build && cd test/webdriverio/test && npx mocha --timeout 30000 dist"
+    "wdio:clean": "cd test/webdriverio/test && rm -rf dist && rm -rf failures",
+    "wdio:run": "npm run wdio:build && cd test/webdriverio/test && mkdir -p failures && npx mocha dist",
+    "wdio:run:ci": "npm run wdio:build && cd test/webdriverio/test && mkdir -p failures && npx mocha --timeout 30000 dist"
   },
   "main": "./dist/index.js",
   "module": "./src/index.js",

test/webdriverio/test/actions_test.ts

@@ -20,6 +20,8 @@ import {
   sendKeyAndWait,
   keyRight,
   contextMenuItems,
+  checkForFailures,
+  idle,
 } from './test_setup.js';
 
 const isDarwin = process.platform === 'darwin';
@@ -96,13 +98,17 @@ suite('Menus test', function () {
       testFileLocations.MORE_BLOCKS,
       this.timeout(),
     );
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
+  });
+
+  teardown(async function() {
+    await checkForFailures(this.browser, this.currentTest!.title, this.currentTest?.state);
   });
 
   test('Menu action via keyboard on block opens menu', async function () {
     // Navigate to draw_circle_1.
     await focusOnBlock(this.browser, 'draw_circle_1');
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
     await sendKeyAndWait(this.browser, [Key.Ctrl, Key.Return]);
 
     chai.assert.deepEqual(
@@ -126,7 +132,7 @@ suite('Menus test', function () {
     await focusOnBlock(this.browser, 'text_print_1');
     await this.browser.keys(Key.ArrowRight);
     await this.browser.keys([Key.Ctrl, Key.Return]);
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
 
     chai.assert.deepEqual(
       await contextMenuItems(this.browser),
@@ -154,9 +160,9 @@ suite('Menus test', function () {
     await moveToToolboxCategory(this.browser, 'Math');
     // Move to flyout.
     await keyRight(this.browser);
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
     await rightClickOnFlyoutBlockType(this.browser, 'math_number');
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
 
     chai.assert.deepEqual(
       await contextMenuItems(this.browser),
@@ -192,11 +198,11 @@ suite('Menus test', function () {
   test('Escape key dismisses menu', async function () {
     await tabNavigateToWorkspace(this.browser);
     await focusOnBlock(this.browser, 'draw_circle_1');
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
     await this.browser.keys([Key.Ctrl, Key.Return]);
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
     await this.browser.keys(Key.Escape);
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
 
     chai.assert.isTrue(
       await contextMenuExists(this.browser, 'Duplicate', /* reverse= */ true),
@@ -207,9 +213,9 @@ suite('Menus test', function () {
   test('Clicking workspace dismisses menu', async function () {
     await tabNavigateToWorkspace(this.browser);
     await clickBlock(this.browser, 'draw_circle_1', {button: 'right'});
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
     await focusWorkspace(this.browser);
-    await this.browser.pause(PAUSE_TIME);
+    await idle(this.browser);
 
     chai.assert.isTrue(
       await contextMenuExists(this.browser, 'Duplicate', /* reverse= */ true),