Fix scrollIntoView warnings

.github/workflows/pull_request.yml

@@ -123,13 +123,13 @@ jobs:
     needs: [python-dependencies, node-dependencies]
     strategy:
       matrix:
-        suite: [ timeout_modal_expired, timeout_modal_extended, timeout_modal_extended_new_window, features, summaries, general, journeys, components, list_collector]
+        suite: [summaries]
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     env:
       EQ_RUN_FUNCTIONAL_TESTS_HEADLESS: True
       # :TODO: Revisit & update when 2 instances can be used without adverse effects
-      EQ_FUNCTIONAL_TEST_MAX_INSTANCES: 2
+      EQ_FUNCTIONAL_TEST_MAX_INSTANCES: 1
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -152,6 +152,12 @@ jobs:
         run: docker compose --version && RUNNER_ENV_FILE=.functional-tests.env docker compose up --build -d
       - name: Functional tests
         run: make test-functional-suite SUITE=${{ matrix.suite }}
+      - name: Upload wdio logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Func test logs
+          path: tests/functional/logs
       - name: Docker compose shutdown
         run: RUNNER_ENV_FILE=.functional-tests.env docker compose kill
   docker-push:

package.json

@@ -27,12 +27,12 @@
         "@babel/plugin-transform-runtime": "^7.25.7",
         "@babel/preset-env": "^7.25.8",
         "@babel/register": "^7.25.7",
-        "@babel/runtime": "^7.25.7",
-        "@wdio/cli": "^9.2.1",
-        "@wdio/local-runner": "^8.14.3",
-        "@wdio/mocha-framework": "^9.1.3",
-        "@wdio/spec-reporter": "^9.1.3",
-        "eslint": "^v8.57.1",
+        "@babel/runtime": "^7.26.0",
+        "@wdio/cli": "^9.3.0",
+        "@wdio/local-runner": "^9.3.0",
+        "@wdio/mocha-framework": "^9.2.8",
+        "@wdio/spec-reporter": "^9.2.14",
+        "eslint": "^v8.57.0",
         "eslint-cli": "^1.1.1",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",

tests/functional/helpers.js

@@ -45,10 +45,13 @@ export const click = async (selector) => {
   // but clicks down on the very top of the button which moves down and just below the mouse. When the mouse click is released
   // it's no longer over the button and the click silently fails. This means that when the test comes to do assertions on the following page
   // they fail, as we never navigated to that page.
-  await $(selector).scrollIntoView({ block: "center", inline: "center" });
-  await $(selector).click();
-
-  // Allow time in case the click loads a new page.
+  const element = await $(selector);
+  await element.waitForDisplayed();
+  await browser.execute((el) => {
+    el.scrollIntoView({ behavior: "smooth", block: "center", inline: "center" });
+  }, element);
+  await element.waitForClickable();
+  await element.click();
   await browser.pause(100);
 };
 

tests/functional/spec/supplementary_data/hub_and_spoke_supplementary_data/hub_and_spoke.spec.js

@@ -0,0 +1,56 @@
+import HubPage from "../../../base_pages/hub.page.js";
+import { click, verifyUrlContains } from "../../../helpers";
+import LoadedSuccessfullyBlockPage from "../../../generated_pages/hub_section_required_with_repeat_supplementary/loaded-successfully-block.page";
+import IntroductionBlockPage from "../../../generated_pages/hub_section_required_with_repeat_supplementary/introduction-block.page";
+import ListCollectorEmployeesPage from "../../../generated_pages/hub_section_required_with_repeat_supplementary/list-collector-employees.page.js";
+import LengthOfEmploymentPage from "../../../generated_pages/hub_section_required_with_repeat_supplementary/length-of-employment.page.js";
+import Section3Page from "../../../generated_pages/hub_section_required_with_repeat_supplementary/section-3-summary.page.js";
+import { getRandomString } from "../../../jwt_helper";
+
+describe("Feature: Hub and Spoke with Supplementary Data", () => {
+  describe("Given a user opens a schema with hub required sections based on a repeating section using supplementary data", () => {
+    beforeEach("Load survey", async () => {
+      const responseId = getRandomString(16);
+      await browser.openQuestionnaire("test_hub_section_required_with_repeat_supplementary.json", {
+        version: "v2",
+        sdsDatasetId: "203b2f9d-c500-8175-98db-86ffcfdccfa3",
+        responseId,
+      });
+    });
+
+    it("When all the repeating sections are complete, Then the hub should be displayed", async () => {
+      await click(LoadedSuccessfullyBlockPage.submit());
+      await click(IntroductionBlockPage.submit());
+
+      // Complete the repeating sections using supplementary data
+      await click(ListCollectorEmployeesPage.submit());
+      await $(LengthOfEmploymentPage.day()).setValue(1);
+      await $(LengthOfEmploymentPage.month()).setValue(1);
+      await $(LengthOfEmploymentPage.year()).setValue(1930);
+      await click(LengthOfEmploymentPage.submit());
+      await click(Section3Page.submit());
+      await $(LengthOfEmploymentPage.day()).setValue(1);
+      await $(LengthOfEmploymentPage.month()).setValue(1);
+      await $(LengthOfEmploymentPage.year()).setValue(1930);
+      await click(LengthOfEmploymentPage.submit());
+      await click(Section3Page.submit());
+      await verifyUrlContains(HubPage.url());
+    });
+
+    it("When the repeating sections are incomplete. Then the hub should not be displayed", async () => {
+      await click(LoadedSuccessfullyBlockPage.submit());
+      await click(IntroductionBlockPage.submit());
+
+      // Don't complete the repeating sections that use supplementary data
+      await click(ListCollectorEmployeesPage.submit());
+      await $(LengthOfEmploymentPage.day()).setValue(1);
+      await $(LengthOfEmploymentPage.month()).setValue(1);
+      await $(LengthOfEmploymentPage.year()).setValue(1930);
+      await click(LengthOfEmploymentPage.submit());
+      await click(Section3Page.submit());
+
+      await browser.url(HubPage.url());
+      await verifyUrlContains("length-of-employment");
+    });
+  });
+});

tests/functional/spec/features/supplementary_data/supplementary_data.spec.js → tests/functional/spec/supplementary_data/supplementary_data/supplementary_data.spec.js

@@ -47,6 +47,7 @@ describe("Using supplementary data", () => {
     });
   });
   it("Given I launch a survey using supplementary data, When I am outside a repeating section, Then I am able to see the list of items relating to a given supplementary data list item on the page", async () => {
+    await expect(await $("#main-content #guidance-1").getText()).toContain("The surnames of the employees are: Potter, Kent.");
     await expect(await $("#main-content #guidance-1").getText()).toContain("The surnames of the employees are: Potter, Kent.");
     await expect(await $$("#main-content li")[0].getText()).toBe("Articles and equipment for sports or outdoor games");
     await expect(await $$("#main-content li")[1].getText()).toBe("Kitchen Equipment");

tests/functional/wdio.conf.js

@@ -23,6 +23,8 @@ exports.config = {
     timeout_modal_extended_new_window: ["./spec/timeout/timeout_modal_extended_new_window/*.js"],
     components: ["./spec/components/**/*.js"],
     features: ["./spec/features/**/*.js"],
+    supplementary_data: ["./spec/supplementary_data/supplementary_data/*.js"],
+    supplementary_data_hub_and_spoke: ["./spec/supplementary_data/hub_and_spoke_supplementary_data/*.js"],
     summaries: ["./spec/summaries/**/*.js"],
     journeys: ["./spec/journeys/**/*.js"],
     list_collector: ["./spec/list_collector/**/*.js"],
@@ -79,7 +81,7 @@ exports.config = {
   // Define all options that are relevant for the WebdriverIO instance here
   //
   // Level of logging verbosity: trace | debug | info | warn | error | silent
-  logLevel: "error",
+  logLevel: "debug",
   outputDir: "tests/functional/logs/",
   //
   // Set specific log levels per logger
@@ -114,7 +116,7 @@ exports.config = {
   connectionRetryTimeout: 120000,
   //
   // Default request retries count
-  connectionRetryCount: 3,
+  connectionRetryCount: 5,
   //
   // Test runner services
   // Services take over a specific job you don't want to take care of. They enhance