Merge branch 'main' into fix-cyclic-imports

ONSdigital · Oct 23, 2024 · 9b56536 · 9b56536
2 parents 5cb5bd8 + 705ba93
commit 9b56536
Show file tree

Hide file tree

Showing 64 changed files with 192 additions and 189 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -86,7 +86,6 @@ jobs:
       - name: Install apt dependencies
         run: |
             sudo apt-get install libsnappy-dev libgconf-2-4 jq
-
             # Install wkthtmltopdf with patched Qt
             sudo apt-get install -y xfonts-base xfonts-75dpi
             wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb
@@ -124,12 +123,13 @@ jobs:
     needs: [python-dependencies, node-dependencies]
     strategy:
       matrix:
-        suite: [ timeout_modal_expired, timeout_modal_extended, timeout_modal_extended_new_window, features, general, components ]
+        suite: [ timeout_modal_expired, timeout_modal_extended, timeout_modal_extended_new_window, features, summaries, general, journeys, components, list_collector]
     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: 1
+      EQ_FUNCTIONAL_TEST_MAX_INSTANCES: 2
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

diff --git a/...sections/enabled_section_checkbox.spec.js → ...sections/enabled_section_checkbox.spec.js b/...sections/enabled_section_checkbox.spec.js → ...sections/enabled_section_checkbox.spec.js
diff --git a/...bled-sections/enabled_section_hub.spec.js → ...bled-sections/enabled_section_hub.spec.js b/...bled-sections/enabled_section_hub.spec.js → ...bled-sections/enabled_section_hub.spec.js
diff --git a/...ed-sections/enabled_section_radio.spec.js → ...ed-sections/enabled_section_radio.spec.js b/...ed-sections/enabled_section_radio.spec.js → ...ed-sections/enabled_section_radio.spec.js
diff --git a/..._and_spoke/choose_another_section.spec.js → ..._and_spoke/choose_another_section.spec.js b/..._and_spoke/choose_another_section.spec.js → ..._and_spoke/choose_another_section.spec.js
diff --git a/...tures/hub_and_spoke/hub_and_spoke.spec.js → ...rneys/hub_and_spoke/hub_and_spoke.spec.js b/...tures/hub_and_spoke/hub_and_spoke.spec.js → ...rneys/hub_and_spoke/hub_and_spoke.spec.js
diff --git a/...poke/hub_and_spoke_custom_content.spec.js → ...poke/hub_and_spoke_custom_content.spec.js b/...poke/hub_and_spoke_custom_content.spec.js → ...poke/hub_and_spoke_custom_content.spec.js
diff --git a/...oke/hub_and_spoke_required_enable.spec.js → ...oke/hub_and_spoke_required_enable.spec.js b/...oke/hub_and_spoke_required_enable.spec.js → ...oke/hub_and_spoke_required_enable.spec.js
diff --git a/...c/features/hub_and_spoke/previous.spec.js → ...c/journeys/hub_and_spoke/previous.spec.js b/...c/features/hub_and_spoke/previous.spec.js → ...c/journeys/hub_and_spoke/previous.spec.js
diff --git a/.../progress/progress_value_source_blocks.js → .../progress/progress_value_source_blocks.js b/.../progress/progress_value_source_blocks.js → .../progress/progress_value_source_blocks.js
diff --git a/...ogress/progress_value_source_repeating.js → ...ogress/progress_value_source_repeating.js b/...ogress/progress_value_source_repeating.js → ...ogress/progress_value_source_repeating.js
diff --git a/...s/list_collector_repeating_blocks.spec.js → ...s/list_collector_repeating_blocks.spec.js b/...s/list_collector_repeating_blocks.spec.js → ...s/list_collector_repeating_blocks.spec.js
diff --git a/...ating_sections_with_hub_and_spoke.spec.js → ...ating_sections_with_hub_and_spoke.spec.js b/...ating_sections_with_hub_and_spoke.spec.js → ...ating_sections_with_hub_and_spoke.spec.js
diff --git a/...onal/spec/features/routing/all_in.spec.js → ...onal/spec/journeys/routing/all_in.spec.js b/...onal/spec/features/routing/all_in.spec.js → ...onal/spec/journeys/routing/all_in.spec.js
diff --git a/...ctional/spec/features/routing/and.spec.js → ...ctional/spec/journeys/routing/and.spec.js b/...ctional/spec/features/routing/and.spec.js → ...ctional/spec/journeys/routing/and.spec.js
diff --git a/...direct_to_list_add_block_checkbox.spec.js → ...direct_to_list_add_block_checkbox.spec.js b/...direct_to_list_add_block_checkbox.spec.js → ...direct_to_list_add_block_checkbox.spec.js
@@ -1,8 +1,8 @@
-import { checkItemsInList, click } from "../helpers";
-import AnyoneLiveAtListCollector from "../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at.page";
-import AnyoneLiveAtListCollectorAddPage from "../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at-add.page";
-import AnyoneLiveAtListCollectorRemovePage from "../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at-remove.page";
-import AnyoneUsuallyLiveAt from "../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-usually-live-at.page";
+import { checkItemsInList, click } from "../../../helpers";
+import AnyoneLiveAtListCollector from "../../../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at.page";
+import AnyoneLiveAtListCollectorAddPage from "../../../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at-add.page";
+import AnyoneLiveAtListCollectorRemovePage from "../../../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-else-live-at-remove.page";
+import AnyoneUsuallyLiveAt from "../../../generated_pages/answer_action_redirect_to_list_add_block_checkbox/anyone-usually-live-at.page";
 
 describe("Answer Action: Redirect To List Add Question (Checkbox)", () => {
   describe('Given the user is on a question with a "RedirectToListAddBlock" action enabled', () => {

diff --git a/..._redirect_to_list_add_block_radio.spec.js → ..._redirect_to_list_add_block_radio.spec.js b/..._redirect_to_list_add_block_radio.spec.js → ..._redirect_to_list_add_block_radio.spec.js
@@ -1,8 +1,8 @@
-import { checkItemsInList, click } from "../helpers";
-import AnyoneLiveAtListCollector from "../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at.page";
-import AnyoneLiveAtListCollectorAddPage from "../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at-add.page";
-import AnyoneLiveAtListCollectorRemovePage from "../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at-remove.page";
-import AnyoneUsuallyLiveAt from "../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-usually-live-at.page";
+import { checkItemsInList, click } from "../../../helpers";
+import AnyoneLiveAtListCollector from "../../../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at.page";
+import AnyoneLiveAtListCollectorAddPage from "../../../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at-add.page";
+import AnyoneLiveAtListCollectorRemovePage from "../../../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-else-live-at-remove.page";
+import AnyoneUsuallyLiveAt from "../../../generated_pages/answer_action_redirect_to_list_add_block_radio/anyone-usually-live-at.page";
 
 describe("Answer Action: Redirect To List Add Question (Radio)", () => {
   describe('Given the user is on a question with a "RedirectToListAddBlock" action enabled', () => {

diff --git a/...routing/answer_comparison_routing.spec.js → ...routing/answer_comparison_routing.spec.js b/...routing/answer_comparison_routing.spec.js → ...routing/answer_comparison_routing.spec.js
diff --git a/...atures/routing/answer_not_on_path.spec.js → ...urneys/routing/answer_not_on_path.spec.js b/...atures/routing/answer_not_on_path.spec.js → ...urneys/routing/answer_not_on_path.spec.js
diff --git a/...tures/routing/answered_unanswered.spec.js → ...rneys/routing/answered_unanswered.spec.js b/...tures/routing/answered_unanswered.spec.js → ...rneys/routing/answered_unanswered.spec.js
diff --git a/...onal/spec/features/routing/any_in.spec.js → ...onal/spec/journeys/routing/any_in.spec.js b/...onal/spec/features/routing/any_in.spec.js → ...onal/spec/journeys/routing/any_in.spec.js
diff --git a/...nal/spec/features/routing/boolean.spec.js → ...nal/spec/journeys/routing/boolean.spec.js b/...nal/spec/features/routing/boolean.spec.js → ...nal/spec/journeys/routing/boolean.spec.js
diff --git a/...c/features/routing/checkbox_count.spec.js → ...c/journeys/routing/checkbox_count.spec.js b/...c/features/routing/checkbox_count.spec.js → ...c/journeys/routing/checkbox_count.spec.js
diff --git a/...spec/conditional_combined_routing.spec.js → ...ting/conditional_combined_routing.spec.js b/...spec/conditional_combined_routing.spec.js → ...ting/conditional_combined_routing.spec.js
@@ -1,8 +1,8 @@
-import ConditionalCombinedRoutingPage from "../generated_pages/conditional_combined_routing/conditional-routing-block.page";
-import ResponseAny from "../generated_pages/conditional_combined_routing/response-any.page";
-import ResponseNotAny from "../generated_pages/conditional_combined_routing/response-not-any.page";
-import SubmitPage from "../generated_pages/conditional_combined_routing/submit.page";
-import { click } from "../helpers";
+import ConditionalCombinedRoutingPage from "../../../generated_pages/conditional_combined_routing/conditional-routing-block.page";
+import ResponseAny from "../../../generated_pages/conditional_combined_routing/response-any.page";
+import ResponseNotAny from "../../../generated_pages/conditional_combined_routing/response-not-any.page";
+import SubmitPage from "../../../generated_pages/conditional_combined_routing/submit.page";
+import { click } from "../../../helpers";
 
 describe("Conditional combined routing.", () => {
   beforeEach(async () => {

diff --git a/...tional/spec/features/routing/date.spec.js → ...tional/spec/journeys/routing/date.spec.js b/...tional/spec/features/routing/date.spec.js → ...tional/spec/journeys/routing/date.spec.js
diff --git a/...nctional/spec/features/routing/in.spec.js → ...nctional/spec/journeys/routing/in.spec.js b/...nctional/spec/features/routing/in.spec.js → ...nctional/spec/journeys/routing/in.spec.js
diff --git a/...ctional/spec/features/routing/not.spec.js → ...ctional/spec/journeys/routing/not.spec.js b/...ctional/spec/features/routing/not.spec.js → ...ctional/spec/journeys/routing/not.spec.js
diff --git a/...onal/spec/features/routing/number.spec.js → ...onal/spec/journeys/routing/number.spec.js b/...onal/spec/features/routing/number.spec.js → ...onal/spec/journeys/routing/number.spec.js
diff --git a/...nctional/spec/features/routing/or.spec.js → ...nctional/spec/journeys/routing/or.spec.js b/...nctional/spec/features/routing/or.spec.js → ...nctional/spec/journeys/routing/or.spec.js
diff --git a/...s/routing/removes_completed_block.spec.js → ...s/routing/removes_completed_block.spec.js b/...s/routing/removes_completed_block.spec.js → ...s/routing/removes_completed_block.spec.js
diff --git a/...answer_comparison_skip_conditions.spec.js → ...answer_comparison_skip_conditions.spec.js b/...answer_comparison_skip_conditions.spec.js → ...answer_comparison_skip_conditions.spec.js
diff --git a/...and_skipping_section_dependencies.spec.js → ...and_skipping_section_dependencies.spec.js b/...and_skipping_section_dependencies.spec.js → ...and_skipping_section_dependencies.spec.js
@@ -1,25 +1,25 @@
-import AgePage from "../generated_pages/routing_and_skipping_section_dependencies/age.page";
-import HouseHoldPersonalDetailsSectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies/household-personal-details-section-summary.page";
-import HouseholdSectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies/household-section-summary.page";
-import ListCollectorAddPage from "../generated_pages/routing_and_skipping_section_dependencies/list-collector-add.page";
-import ListCollectorPage from "../generated_pages/routing_and_skipping_section_dependencies/list-collector.page";
-import NamePage from "../generated_pages/routing_and_skipping_section_dependencies/name-block.page";
-import PrimaryPersonSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies/primary-person-summary.page";
-import ReasonNoConfirmationPage from "../generated_pages/routing_and_skipping_section_dependencies/reason-no-confirmation.page";
-import RepeatingAgePage from "../generated_pages/routing_and_skipping_section_dependencies/repeating-age.page";
-import RepeatingSexPage from "../generated_pages/routing_and_skipping_section_dependencies/repeating-sex.page";
-import SecurityPage from "../generated_pages/routing_and_skipping_section_dependencies/security.page";
-import SkipAgePage from "../generated_pages/routing_and_skipping_section_dependencies/skip-age.page";
-import SkipEnableSectionPage from "../generated_pages/routing_and_skipping_section_dependencies/skip-household-section.page";
-import EnableSectionPage from "../generated_pages/routing_and_skipping_section_dependencies/enable-section.page";
-import SkipConfirmationPage from "../generated_pages/routing_and_skipping_section_dependencies/skip-confirmation.page";
-import SkipConfirmationSectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies/skip-confirmation-section-summary.page";
-import SkipSectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies/skip-section-summary.page";
-import RepeatingIsDependentPage from "../generated_pages/routing_and_skipping_section_dependencies/repeating-is-dependent.page";
-import RepeatingIsSmokerPage from "../generated_pages/routing_and_skipping_section_dependencies/repeating-is-smoker.page";
-
-import HubPage from "../base_pages/hub.page";
-import { click } from "../helpers";
+import AgePage from "../../../generated_pages/routing_and_skipping_section_dependencies/age.page";
+import HouseHoldPersonalDetailsSectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies/household-personal-details-section-summary.page";
+import HouseholdSectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies/household-section-summary.page";
+import ListCollectorAddPage from "../../../generated_pages/routing_and_skipping_section_dependencies/list-collector-add.page";
+import ListCollectorPage from "../../../generated_pages/routing_and_skipping_section_dependencies/list-collector.page";
+import NamePage from "../../../generated_pages/routing_and_skipping_section_dependencies/name-block.page";
+import PrimaryPersonSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies/primary-person-summary.page";
+import ReasonNoConfirmationPage from "../../../generated_pages/routing_and_skipping_section_dependencies/reason-no-confirmation.page";
+import RepeatingAgePage from "../../../generated_pages/routing_and_skipping_section_dependencies/repeating-age.page";
+import RepeatingSexPage from "../../../generated_pages/routing_and_skipping_section_dependencies/repeating-sex.page";
+import SecurityPage from "../../../generated_pages/routing_and_skipping_section_dependencies/security.page";
+import SkipAgePage from "../../../generated_pages/routing_and_skipping_section_dependencies/skip-age.page";
+import SkipEnableSectionPage from "../../../generated_pages/routing_and_skipping_section_dependencies/skip-household-section.page";
+import EnableSectionPage from "../../../generated_pages/routing_and_skipping_section_dependencies/enable-section.page";
+import SkipConfirmationPage from "../../../generated_pages/routing_and_skipping_section_dependencies/skip-confirmation.page";
+import SkipConfirmationSectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies/skip-confirmation-section-summary.page";
+import SkipSectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies/skip-section-summary.page";
+import RepeatingIsDependentPage from "../../../generated_pages/routing_and_skipping_section_dependencies/repeating-is-dependent.page";
+import RepeatingIsSmokerPage from "../../../generated_pages/routing_and_skipping_section_dependencies/repeating-is-smoker.page";
+
+import HubPage from "../../../base_pages/hub.page";
+import { click } from "../../../helpers";
 
 describe("Routing and skipping section dependencies", () => {
   describe("Given the routing and skipping section dependencies questionnaire", () => {

diff --git a/...n_dependencies_calculated_summary.spec.js → ...n_dependencies_calculated_summary.spec.js b/...n_dependencies_calculated_summary.spec.js → ...n_dependencies_calculated_summary.spec.js
@@ -1,15 +1,15 @@
-import CalculatedSummarySectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/calculated-summary-section-summary.page";
-import CurrencyTotalPlaybackPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/currency-total-playback.page";
-import DependentQuestionSectionSummaryPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/dependent-question-section-summary.page";
-import FirstQuestionBlockPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/first-question-block.page";
-import FruitPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/fruit.page";
-import SecondQuestionBlockPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/second-question-block.page";
-import VegetablesPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/vegetables.page";
-import SkipQuestionPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/skip-butter-block.page";
-import ButterPage from "../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/butter-block.page";
-
-import HubPage from "../base_pages/hub.page";
-import { click } from "../helpers";
+import CalculatedSummarySectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/calculated-summary-section-summary.page";
+import CurrencyTotalPlaybackPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/currency-total-playback.page";
+import DependentQuestionSectionSummaryPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/dependent-question-section-summary.page";
+import FirstQuestionBlockPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/first-question-block.page";
+import FruitPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/fruit.page";
+import SecondQuestionBlockPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/second-question-block.page";
+import VegetablesPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/vegetables.page";
+import SkipQuestionPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/skip-butter-block.page";
+import ButterPage from "../../../generated_pages/routing_and_skipping_section_dependencies_calculated_summary/butter-block.page";
+
+import HubPage from "../../../base_pages/hub.page";
+import { click } from "../../../helpers";
 
 describe("Routing and skipping section dependencies based on calculated summaries", () => {
   describe("Given the section dependencies based on a calculated summary questionnaire", () => {

diff --git a/...al/spec/routing_checkbox_contains.spec.js → ...kipping/routing_checkbox_contains.spec.js b/...al/spec/routing_checkbox_contains.spec.js → ...kipping/routing_checkbox_contains.spec.js
@@ -1,8 +1,8 @@
-import RoutingCheckboxContains from "../generated_pages/routing_checkbox_contains/country-checkbox.page";
-import ContainsAllPage from "../generated_pages/routing_checkbox_contains/country-interstitial-all.page";
-import ContainsAnyPage from "../generated_pages/routing_checkbox_contains/country-interstitial-any.page";
-import SubmitPage from "../generated_pages/routing_checkbox_contains/submit.page";
-import { click } from "../helpers";
+import RoutingCheckboxContains from "../../../generated_pages/routing_checkbox_contains/country-checkbox.page";
+import ContainsAllPage from "../../../generated_pages/routing_checkbox_contains/country-interstitial-all.page";
+import ContainsAnyPage from "../../../generated_pages/routing_checkbox_contains/country-interstitial-any.page";
+import SubmitPage from "../../../generated_pages/routing_checkbox_contains/submit.page";
+import { click } from "../../../helpers";
 describe("Routing Checkbox Contains Condition.", () => {
   beforeEach(async () => {
     await browser.openQuestionnaire("test_routing_checkbox_contains.json");

diff --git a/...ctional/spec/skip_condition_block.spec.js → ...eys/skipping/skip_condition_block.spec.js b/...ctional/spec/skip_condition_block.spec.js → ...eys/skipping/skip_condition_block.spec.js
@@ -1,7 +1,7 @@
-import QuestionPage from "../generated_pages/skip_condition_block/do-you-want-to-skip.page";
-import SkipPage from "../generated_pages/skip_condition_block/should-skip.page";
-import SubmitPage from "../generated_pages/skip_condition_block/submit.page";
-import { click } from "../helpers";
+import QuestionPage from "../../../generated_pages/skip_condition_block/do-you-want-to-skip.page";
+import SkipPage from "../../../generated_pages/skip_condition_block/should-skip.page";
+import SubmitPage from "../../../generated_pages/skip_condition_block/submit.page";
+import { click } from "../../../helpers";
 describe("Skip Conditions - Block", () => {
   const schema = "test_skip_condition_block.json";
 

diff --git a/...ctional/spec/skip_condition_group.spec.js → ...eys/skipping/skip_condition_group.spec.js b/...ctional/spec/skip_condition_group.spec.js → ...eys/skipping/skip_condition_group.spec.js
@@ -1,7 +1,7 @@
-import QuestionPage from "../generated_pages/skip_condition_group/do-you-want-to-skip.page";
-import SkipPage from "../generated_pages/skip_condition_group/should-skip.page";
-import SubmitPage from "../generated_pages/skip_condition_group/submit.page";
-import { click } from "../helpers";
+import QuestionPage from "../../../generated_pages/skip_condition_group/do-you-want-to-skip.page";
+import SkipPage from "../../../generated_pages/skip_condition_group/should-skip.page";
+import SubmitPage from "../../../generated_pages/skip_condition_group/submit.page";
+import { click } from "../../../helpers";
 describe("Skip Conditions - Group", () => {
   const schema = "test_skip_condition_group.json";
 

diff --git a/...nctional/spec/skip_condition_list.spec.js → ...neys/skipping/skip_condition_list.spec.js b/...nctional/spec/skip_condition_list.spec.js → ...neys/skipping/skip_condition_list.spec.js
@@ -1,9 +1,9 @@
-import ListCollectorPage from "../generated_pages/skip_condition_list/list-collector.page.js";
-import ListCollectorAddPage from "../generated_pages/skip_condition_list/list-collector-add.page.js";
-import LessThanTwoInterstitialPage from "../generated_pages/skip_condition_list/less-than-two-interstitial.page.js";
-import TwoInterstitialPage from "../generated_pages/skip_condition_list/two-interstitial.page.js";
-import MoreThanTwoInterstitialPage from "../generated_pages/skip_condition_list/more-than-two-interstitial.page.js";
-import { click } from "../helpers";
+import ListCollectorPage from "../../../generated_pages/skip_condition_list/list-collector.page.js";
+import ListCollectorAddPage from "../../../generated_pages/skip_condition_list/list-collector-add.page.js";
+import LessThanTwoInterstitialPage from "../../../generated_pages/skip_condition_list/less-than-two-interstitial.page.js";
+import TwoInterstitialPage from "../../../generated_pages/skip_condition_list/two-interstitial.page.js";
+import MoreThanTwoInterstitialPage from "../../../generated_pages/skip_condition_list/more-than-two-interstitial.page.js";
+import { click } from "../../../helpers";
 describe("Feature: Routing on lists", () => {
   describe("Given I start skip condition list survey", () => {
     beforeEach(async () => {

diff --git a/...onal/spec/skip_conditions_not_set.spec.js → .../skipping/skip_conditions_not_set.spec.js b/...onal/spec/skip_conditions_not_set.spec.js → .../skipping/skip_conditions_not_set.spec.js
@@ -1,7 +1,7 @@
-import FoodPage from "../generated_pages/skip_condition_not_set/food-block.page";
-import DrinkPage from "../generated_pages/skip_condition_not_set/drink-block.page";
-import SubmitPage from "../generated_pages/skip_condition_not_set/submit.page";
-import { click } from "../helpers";
+import FoodPage from "../../../generated_pages/skip_condition_not_set/food-block.page";
+import DrinkPage from "../../../generated_pages/skip_condition_not_set/drink-block.page";
+import SubmitPage from "../../../generated_pages/skip_condition_not_set/submit.page";
+import { click } from "../../../helpers";
 describe("Skip Conditions - Not Set", () => {
   beforeEach("Load the survey", async () => {
     await browser.openQuestionnaire("test_skip_condition_not_set.json");

diff --git a/...nctional/spec/skip_conditions_set.spec.js → ...neys/skipping/skip_conditions_set.spec.js b/...nctional/spec/skip_conditions_set.spec.js → ...neys/skipping/skip_conditions_set.spec.js
@@ -1,7 +1,7 @@
-import FoodPage from "../generated_pages/skip_condition_set/food-block.page";
-import DrinkPage from "../generated_pages/skip_condition_set/drink-block.page";
-import SubmitPage from "../generated_pages/skip_condition_set/submit.page";
-import { click } from "../helpers";
+import FoodPage from "../../../generated_pages/skip_condition_set/food-block.page";
+import DrinkPage from "../../../generated_pages/skip_condition_set/drink-block.page";
+import SubmitPage from "../../../generated_pages/skip_condition_set/submit.page";
+import { click } from "../../../helpers";
 describe("Skip Conditions - Set", () => {
   beforeEach("Load the survey", async () => {
     await browser.openQuestionnaire("test_skip_condition_set.json");