fix: webdriverio tests.

Use tab navigation instead of clicking for selection.

Author: BenHenning

test/webdriverio/test/basic_test.ts

@@ -15,10 +15,9 @@ import {
   testSetup,
   testFileLocations,
   PAUSE_TIME,
-  getBlockElementById,
-  clickBlock,
+  tabNavigateToWorkspace,
 } from './test_setup.js';
-import {Key, ClickOptions} from 'webdriverio';
+import {Key} from 'webdriverio';
 
 suite('Keyboard navigation', function () {
   // Setting timeout to unlimited as these tests take a longer time to run than most mocha test
@@ -38,9 +37,7 @@ suite('Keyboard navigation', function () {
   });
 
   test('Selected block', async function () {
-    const block = await getBlockElementById(this.browser, 'p5_setup_1');
-    await clickBlock(this.browser, block, {button: 0} as ClickOptions);
-    await this.browser.pause(PAUSE_TIME);
+    await tabNavigateToWorkspace(this.browser);
 
     for (let i = 0; i < 8; i++) {
       await this.browser.keys(Key.ArrowDown);

test/webdriverio/test/clipboard_test.ts

@@ -12,16 +12,10 @@ import {
   PAUSE_TIME,
   getBlockElementById,
   getSelectedBlockId,
-  clickBlock,
   ElementWithId,
+  tabNavigateToWorkspace,
 } from './test_setup.js';
-import {
-  ClickOptions,
-  Key,
-  KeyAction,
-  PointerAction,
-  WheelAction,
-} from 'webdriverio';
+import {Key, KeyAction, PointerAction, WheelAction} from 'webdriverio';
 
 suite('Clipboard test', function () {
   // Setting timeout to unlimited as these tests take longer time to run
@@ -34,17 +28,21 @@ suite('Clipboard test', function () {
   });
 
   test('Copy and paste while block selected', async function () {
-    const block = await getBlockElementById(this.browser, 'draw_circle_1');
-    await clickBlock(this.browser, block, {button: 0} as ClickOptions);
+    // Navigate to draw_circle_1.
+    await tabNavigateToWorkspace(this.browser);
+    for (let i = 0; i < 8; i++) {
+      await this.browser.keys(Key.ArrowDown);
+      await this.browser.pause(PAUSE_TIME);
+    }
 
     // Copy and paste
     await this.browser.keys([Key.Ctrl, 'c']);
     await this.browser.keys([Key.Ctrl, 'v']);
     await this.browser.pause(PAUSE_TIME);
 
+    const block = await getBlockElementById(this.browser, 'draw_circle_1');
     const blocks = await getSameBlocks(this.browser, block);
     const selectedId = await getSelectedBlockId(this.browser);
-
     chai.assert.equal(await blocks.length, 2);
     chai.assert.equal(
       selectedId,
@@ -54,8 +52,13 @@ suite('Clipboard test', function () {
   });
 
   test('Cut and paste while block selected', async function () {
+    // Navigate to draw_circle_1.
+    await tabNavigateToWorkspace(this.browser);
+    for (let i = 0; i < 8; i++) {
+      await this.browser.keys(Key.ArrowDown);
+      await this.browser.pause(PAUSE_TIME);
+    }
     const block = await getBlockElementById(this.browser, 'draw_circle_1');
-    await clickBlock(this.browser, block, {button: 0} as ClickOptions);
 
     // Cut and paste
     await this.browser.keys([Key.Ctrl, 'x']);

test/webdriverio/test/test_setup.ts

@@ -260,6 +260,34 @@ export async function getBlockElementById(
   return elem;
 }
 
+/**
+ * Uses tabs to navigate to the workspace on the test page (i.e. by going
+ * through top-level tab stops).
+ *
+ * @param browser The active WebdriverIO Browser object.
+ * @param hasToolbox Whether a toolbox is configured on the test page.
+ * @param hasFlyout Whether a flyout is configured on the test page.
+ */
+export async function tabNavigateToWorkspace(
+  browser: WebdriverIO.Browser,
+  hasToolbox = true,
+  hasFlyout = true,
+) {
+  if (hasToolbox) tabNavigateForward(browser);
+  if (hasFlyout) tabNavigateForward(browser);
+  tabNavigateForward(browser); // Tab to the workspace itself.
+}
+
+/**
+ * Navigates forward to the test page's next tab stop.
+ *
+ * @param browser The active WebdriverIO Browser object.
+ */
+export async function tabNavigateForward(browser: WebdriverIO.Browser) {
+  await browser.keys(webdriverio.Key.Tab);
+  await browser.pause(PAUSE_TIME);
+}
+
 /**
  * Copied from blockly browser test_setup.mjs and amended for typescript
  *