diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9fb18a3eca..86ca206116 100644 --- 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/tests/functional/spec/features/enabled-sections/enabled_section_checkbox.spec.js b/tests/functional/spec/journeys/enabled-sections/enabled_section_checkbox.spec.js similarity index 100% rename from tests/functional/spec/features/enabled-sections/enabled_section_checkbox.spec.js rename to tests/functional/spec/journeys/enabled-sections/enabled_section_checkbox.spec.js diff --git a/tests/functional/spec/features/enabled-sections/enabled_section_hub.spec.js b/tests/functional/spec/journeys/enabled-sections/enabled_section_hub.spec.js similarity index 100% rename from tests/functional/spec/features/enabled-sections/enabled_section_hub.spec.js rename to tests/functional/spec/journeys/enabled-sections/enabled_section_hub.spec.js diff --git a/tests/functional/spec/features/enabled-sections/enabled_section_radio.spec.js b/tests/functional/spec/journeys/enabled-sections/enabled_section_radio.spec.js similarity index 100% rename from tests/functional/spec/features/enabled-sections/enabled_section_radio.spec.js rename to tests/functional/spec/journeys/enabled-sections/enabled_section_radio.spec.js diff --git a/tests/functional/spec/features/hub_and_spoke/choose_another_section.spec.js b/tests/functional/spec/journeys/hub_and_spoke/choose_another_section.spec.js similarity index 100% rename from tests/functional/spec/features/hub_and_spoke/choose_another_section.spec.js rename to tests/functional/spec/journeys/hub_and_spoke/choose_another_section.spec.js diff --git a/tests/functional/spec/features/hub_and_spoke/hub_and_spoke.spec.js b/tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke.spec.js similarity index 100% rename from tests/functional/spec/features/hub_and_spoke/hub_and_spoke.spec.js rename to tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke.spec.js diff --git a/tests/functional/spec/features/hub_and_spoke/hub_and_spoke_custom_content.spec.js b/tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke_custom_content.spec.js similarity index 100% rename from tests/functional/spec/features/hub_and_spoke/hub_and_spoke_custom_content.spec.js rename to tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke_custom_content.spec.js diff --git a/tests/functional/spec/features/hub_and_spoke/hub_and_spoke_required_enable.spec.js b/tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke_required_enable.spec.js similarity index 100% rename from tests/functional/spec/features/hub_and_spoke/hub_and_spoke_required_enable.spec.js rename to tests/functional/spec/journeys/hub_and_spoke/hub_and_spoke_required_enable.spec.js diff --git a/tests/functional/spec/features/hub_and_spoke/previous.spec.js b/tests/functional/spec/journeys/hub_and_spoke/previous.spec.js similarity index 100% rename from tests/functional/spec/features/hub_and_spoke/previous.spec.js rename to tests/functional/spec/journeys/hub_and_spoke/previous.spec.js diff --git a/tests/functional/spec/features/progress/progress_value_source_blocks.js b/tests/functional/spec/journeys/progress/progress_value_source_blocks.js similarity index 100% rename from tests/functional/spec/features/progress/progress_value_source_blocks.js rename to tests/functional/spec/journeys/progress/progress_value_source_blocks.js diff --git a/tests/functional/spec/features/progress/progress_value_source_repeating.js b/tests/functional/spec/journeys/progress/progress_value_source_repeating.js similarity index 100% rename from tests/functional/spec/features/progress/progress_value_source_repeating.js rename to tests/functional/spec/journeys/progress/progress_value_source_repeating.js diff --git a/tests/functional/spec/features/repeating_blocks/list_collector_repeating_blocks.spec.js b/tests/functional/spec/journeys/repeating_blocks/list_collector_repeating_blocks.spec.js similarity index 100% rename from tests/functional/spec/features/repeating_blocks/list_collector_repeating_blocks.spec.js rename to tests/functional/spec/journeys/repeating_blocks/list_collector_repeating_blocks.spec.js diff --git a/tests/functional/spec/features/repeating_sections/repeating_sections_with_hub_and_spoke.spec.js b/tests/functional/spec/journeys/repeating_sections/repeating_sections_with_hub_and_spoke.spec.js similarity index 100% rename from tests/functional/spec/features/repeating_sections/repeating_sections_with_hub_and_spoke.spec.js rename to tests/functional/spec/journeys/repeating_sections/repeating_sections_with_hub_and_spoke.spec.js diff --git a/tests/functional/spec/features/routing/all_in.spec.js b/tests/functional/spec/journeys/routing/all_in.spec.js similarity index 100% rename from tests/functional/spec/features/routing/all_in.spec.js rename to tests/functional/spec/journeys/routing/all_in.spec.js diff --git a/tests/functional/spec/features/routing/and.spec.js b/tests/functional/spec/journeys/routing/and.spec.js similarity index 100% rename from tests/functional/spec/features/routing/and.spec.js rename to tests/functional/spec/journeys/routing/and.spec.js diff --git a/tests/functional/spec/answer_action_redirect_to_list_add_block_checkbox.spec.js b/tests/functional/spec/journeys/routing/answer_action_redirect_to_list_add_block_checkbox.spec.js similarity index 84% rename from tests/functional/spec/answer_action_redirect_to_list_add_block_checkbox.spec.js rename to tests/functional/spec/journeys/routing/answer_action_redirect_to_list_add_block_checkbox.spec.js index 05d1d5bf5a..0ca4e74ab3 100644 --- a/tests/functional/spec/answer_action_redirect_to_list_add_block_checkbox.spec.js +++ b/tests/functional/spec/journeys/routing/answer_action_redirect_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/tests/functional/spec/answer_action_redirect_to_list_add_block_radio.spec.js b/tests/functional/spec/journeys/routing/answer_action_redirect_to_list_add_block_radio.spec.js similarity index 85% rename from tests/functional/spec/answer_action_redirect_to_list_add_block_radio.spec.js rename to tests/functional/spec/journeys/routing/answer_action_redirect_to_list_add_block_radio.spec.js index 46871e6162..74354b1ad7 100644 --- a/tests/functional/spec/answer_action_redirect_to_list_add_block_radio.spec.js +++ b/tests/functional/spec/journeys/routing/answer_action_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/tests/functional/spec/features/routing/answer_comparison_routing.spec.js b/tests/functional/spec/journeys/routing/answer_comparison_routing.spec.js similarity index 100% rename from tests/functional/spec/features/routing/answer_comparison_routing.spec.js rename to tests/functional/spec/journeys/routing/answer_comparison_routing.spec.js diff --git a/tests/functional/spec/features/routing/answer_not_on_path.spec.js b/tests/functional/spec/journeys/routing/answer_not_on_path.spec.js similarity index 100% rename from tests/functional/spec/features/routing/answer_not_on_path.spec.js rename to tests/functional/spec/journeys/routing/answer_not_on_path.spec.js diff --git a/tests/functional/spec/features/routing/answered_unanswered.spec.js b/tests/functional/spec/journeys/routing/answered_unanswered.spec.js similarity index 100% rename from tests/functional/spec/features/routing/answered_unanswered.spec.js rename to tests/functional/spec/journeys/routing/answered_unanswered.spec.js diff --git a/tests/functional/spec/features/routing/any_in.spec.js b/tests/functional/spec/journeys/routing/any_in.spec.js similarity index 100% rename from tests/functional/spec/features/routing/any_in.spec.js rename to tests/functional/spec/journeys/routing/any_in.spec.js diff --git a/tests/functional/spec/features/routing/boolean.spec.js b/tests/functional/spec/journeys/routing/boolean.spec.js similarity index 100% rename from tests/functional/spec/features/routing/boolean.spec.js rename to tests/functional/spec/journeys/routing/boolean.spec.js diff --git a/tests/functional/spec/features/routing/checkbox_count.spec.js b/tests/functional/spec/journeys/routing/checkbox_count.spec.js similarity index 100% rename from tests/functional/spec/features/routing/checkbox_count.spec.js rename to tests/functional/spec/journeys/routing/checkbox_count.spec.js diff --git a/tests/functional/spec/conditional_combined_routing.spec.js b/tests/functional/spec/journeys/routing/conditional_combined_routing.spec.js similarity index 77% rename from tests/functional/spec/conditional_combined_routing.spec.js rename to tests/functional/spec/journeys/routing/conditional_combined_routing.spec.js index 9a82287153..c375ea447d 100644 --- a/tests/functional/spec/conditional_combined_routing.spec.js +++ b/tests/functional/spec/journeys/routing/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/tests/functional/spec/features/routing/date.spec.js b/tests/functional/spec/journeys/routing/date.spec.js similarity index 100% rename from tests/functional/spec/features/routing/date.spec.js rename to tests/functional/spec/journeys/routing/date.spec.js diff --git a/tests/functional/spec/features/routing/in.spec.js b/tests/functional/spec/journeys/routing/in.spec.js similarity index 100% rename from tests/functional/spec/features/routing/in.spec.js rename to tests/functional/spec/journeys/routing/in.spec.js diff --git a/tests/functional/spec/features/routing/not.spec.js b/tests/functional/spec/journeys/routing/not.spec.js similarity index 100% rename from tests/functional/spec/features/routing/not.spec.js rename to tests/functional/spec/journeys/routing/not.spec.js diff --git a/tests/functional/spec/features/routing/number.spec.js b/tests/functional/spec/journeys/routing/number.spec.js similarity index 100% rename from tests/functional/spec/features/routing/number.spec.js rename to tests/functional/spec/journeys/routing/number.spec.js diff --git a/tests/functional/spec/features/routing/or.spec.js b/tests/functional/spec/journeys/routing/or.spec.js similarity index 100% rename from tests/functional/spec/features/routing/or.spec.js rename to tests/functional/spec/journeys/routing/or.spec.js diff --git a/tests/functional/spec/features/routing/removes_completed_block.spec.js b/tests/functional/spec/journeys/routing/removes_completed_block.spec.js similarity index 100% rename from tests/functional/spec/features/routing/removes_completed_block.spec.js rename to tests/functional/spec/journeys/routing/removes_completed_block.spec.js diff --git a/tests/functional/spec/features/skipping/answer_comparison_skip_conditions.spec.js b/tests/functional/spec/journeys/skipping/answer_comparison_skip_conditions.spec.js similarity index 100% rename from tests/functional/spec/features/skipping/answer_comparison_skip_conditions.spec.js rename to tests/functional/spec/journeys/skipping/answer_comparison_skip_conditions.spec.js diff --git a/tests/functional/spec/routing_and_skipping_section_dependencies.spec.js b/tests/functional/spec/journeys/skipping/routing_and_skipping_section_dependencies.spec.js similarity index 90% rename from tests/functional/spec/routing_and_skipping_section_dependencies.spec.js rename to tests/functional/spec/journeys/skipping/routing_and_skipping_section_dependencies.spec.js index f70896c05e..773637e2a5 100644 --- a/tests/functional/spec/routing_and_skipping_section_dependencies.spec.js +++ b/tests/functional/spec/journeys/skipping/routing_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/tests/functional/spec/routing_and_skipping_section_dependencies_calculated_summary.spec.js b/tests/functional/spec/journeys/skipping/routing_and_skipping_section_dependencies_calculated_summary.spec.js similarity index 88% rename from tests/functional/spec/routing_and_skipping_section_dependencies_calculated_summary.spec.js rename to tests/functional/spec/journeys/skipping/routing_and_skipping_section_dependencies_calculated_summary.spec.js index 59e5bf2aef..258e92987b 100644 --- a/tests/functional/spec/routing_and_skipping_section_dependencies_calculated_summary.spec.js +++ b/tests/functional/spec/journeys/skipping/routing_and_skipping_section_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/tests/functional/spec/routing_checkbox_contains.spec.js b/tests/functional/spec/journeys/skipping/routing_checkbox_contains.spec.js similarity index 85% rename from tests/functional/spec/routing_checkbox_contains.spec.js rename to tests/functional/spec/journeys/skipping/routing_checkbox_contains.spec.js index be317ee262..a5a58e02a0 100644 --- a/tests/functional/spec/routing_checkbox_contains.spec.js +++ b/tests/functional/spec/journeys/skipping/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/tests/functional/spec/skip_condition_block.spec.js b/tests/functional/spec/journeys/skipping/skip_condition_block.spec.js similarity index 72% rename from tests/functional/spec/skip_condition_block.spec.js rename to tests/functional/spec/journeys/skipping/skip_condition_block.spec.js index 2eb93ab759..c9c444fd2a 100644 --- a/tests/functional/spec/skip_condition_block.spec.js +++ b/tests/functional/spec/journeys/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/tests/functional/spec/skip_condition_group.spec.js b/tests/functional/spec/journeys/skipping/skip_condition_group.spec.js similarity index 72% rename from tests/functional/spec/skip_condition_group.spec.js rename to tests/functional/spec/journeys/skipping/skip_condition_group.spec.js index 8473ced58f..fd6e7c0842 100644 --- a/tests/functional/spec/skip_condition_group.spec.js +++ b/tests/functional/spec/journeys/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/tests/functional/spec/skip_condition_list.spec.js b/tests/functional/spec/journeys/skipping/skip_condition_list.spec.js similarity index 83% rename from tests/functional/spec/skip_condition_list.spec.js rename to tests/functional/spec/journeys/skipping/skip_condition_list.spec.js index 2ec01c2ece..4ee08e3ee7 100644 --- a/tests/functional/spec/skip_condition_list.spec.js +++ b/tests/functional/spec/journeys/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/tests/functional/spec/skip_conditions_not_set.spec.js b/tests/functional/spec/journeys/skipping/skip_conditions_not_set.spec.js similarity index 66% rename from tests/functional/spec/skip_conditions_not_set.spec.js rename to tests/functional/spec/journeys/skipping/skip_conditions_not_set.spec.js index 5bd576b804..536eae89fc 100644 --- a/tests/functional/spec/skip_conditions_not_set.spec.js +++ b/tests/functional/spec/journeys/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/tests/functional/spec/skip_conditions_set.spec.js b/tests/functional/spec/journeys/skipping/skip_conditions_set.spec.js similarity index 67% rename from tests/functional/spec/skip_conditions_set.spec.js rename to tests/functional/spec/journeys/skipping/skip_conditions_set.spec.js index 491c6e344f..3cb75c39fd 100644 --- a/tests/functional/spec/skip_conditions_set.spec.js +++ b/tests/functional/spec/journeys/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"); diff --git a/tests/functional/spec/list_collector.spec.js b/tests/functional/spec/list_collector/list_collector.spec.js similarity index 83% rename from tests/functional/spec/list_collector.spec.js rename to tests/functional/spec/list_collector/list_collector.spec.js index 2e53ef29bb..e970a27af0 100644 --- a/tests/functional/spec/list_collector.spec.js +++ b/tests/functional/spec/list_collector/list_collector.spec.js @@ -1,25 +1,25 @@ -import { checkItemsInList, click } from "../helpers"; -import AnotherListCollectorPage from "../generated_pages/list_collector/another-list-collector-block.page.js"; -import AnotherListCollectorAddPage from "../generated_pages/list_collector/another-list-collector-block-add.page.js"; -import AnotherListCollectorEditPage from "../generated_pages/list_collector/another-list-collector-block-edit.page.js"; -import AnotherListCollectorRemovePage from "../generated_pages/list_collector/another-list-collector-block-remove.page.js"; -import ListCollectorPage from "../generated_pages/list_collector/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/list_collector/list-collector-add.page.js"; -import ListCollectorEditPage from "../generated_pages/list_collector/list-collector-edit.page.js"; -import ListCollectorRemovePage from "../generated_pages/list_collector/list-collector-remove.page.js"; -import NextInterstitialPage from "../generated_pages/list_collector/next-interstitial.page.js"; -import SummaryPage from "../generated_pages/list_collector/section-summary.page.js"; -import PrimaryPersonListCollectorPage from "../generated_pages/list_collector_list_summary/primary-person-list-collector.page.js"; -import PrimaryPersonListCollectorAddPage from "../generated_pages/list_collector_list_summary/primary-person-list-collector-add.page.js"; -import SectionSummaryListCollectorPage from "../generated_pages/list_collector_list_summary/list-collector.page.js"; -import SectionSummaryListCollectorAddPage from "../generated_pages/list_collector_list_summary/list-collector-add.page.js"; -import SectionSummaryListCollectorEditPage from "../generated_pages/list_collector_list_summary/list-collector-edit.page.js"; -import SectionSummaryListCollectorRemovePage from "../generated_pages/list_collector_list_summary/list-collector-remove.page.js"; -import VisitorListCollectorPage from "../generated_pages/list_collector_list_summary/visitor-list-collector.page.js"; -import VisitorListCollectorAddPage from "../generated_pages/list_collector_list_summary/visitor-list-collector-add.page.js"; -import PeopleListSectionSummaryPage from "../generated_pages/list_collector_list_summary/section-summary.page.js"; -import { SubmitPage } from "../base_pages/submit.page.js"; -import IntroductionPage from "../generated_pages/list_collector_list_summary/introduction.page.js"; +import { checkItemsInList, click } from "../../helpers"; +import AnotherListCollectorPage from "../../generated_pages/list_collector/another-list-collector-block.page.js"; +import AnotherListCollectorAddPage from "../../generated_pages/list_collector/another-list-collector-block-add.page.js"; +import AnotherListCollectorEditPage from "../../generated_pages/list_collector/another-list-collector-block-edit.page.js"; +import AnotherListCollectorRemovePage from "../../generated_pages/list_collector/another-list-collector-block-remove.page.js"; +import ListCollectorPage from "../../generated_pages/list_collector/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/list_collector/list-collector-add.page.js"; +import ListCollectorEditPage from "../../generated_pages/list_collector/list-collector-edit.page.js"; +import ListCollectorRemovePage from "../../generated_pages/list_collector/list-collector-remove.page.js"; +import NextInterstitialPage from "../../generated_pages/list_collector/next-interstitial.page.js"; +import SummaryPage from "../../generated_pages/list_collector/section-summary.page.js"; +import PrimaryPersonListCollectorPage from "../../generated_pages/list_collector_list_summary/primary-person-list-collector.page.js"; +import PrimaryPersonListCollectorAddPage from "../../generated_pages/list_collector_list_summary/primary-person-list-collector-add.page.js"; +import SectionSummaryListCollectorPage from "../../generated_pages/list_collector_list_summary/list-collector.page.js"; +import SectionSummaryListCollectorAddPage from "../../generated_pages/list_collector_list_summary/list-collector-add.page.js"; +import SectionSummaryListCollectorEditPage from "../../generated_pages/list_collector_list_summary/list-collector-edit.page.js"; +import SectionSummaryListCollectorRemovePage from "../../generated_pages/list_collector_list_summary/list-collector-remove.page.js"; +import VisitorListCollectorPage from "../../generated_pages/list_collector_list_summary/visitor-list-collector.page.js"; +import VisitorListCollectorAddPage from "../../generated_pages/list_collector_list_summary/visitor-list-collector-add.page.js"; +import PeopleListSectionSummaryPage from "../../generated_pages/list_collector_list_summary/section-summary.page.js"; +import { SubmitPage } from "../../base_pages/submit.page.js"; +import IntroductionPage from "../../generated_pages/list_collector_list_summary/introduction.page.js"; describe("List Collector", () => { describe("Given a normal journey through the list collector without variants", () => { diff --git a/tests/functional/spec/list_collector_content.spec.js b/tests/functional/spec/list_collector/list_collector_content.spec.js similarity index 86% rename from tests/functional/spec/list_collector_content.spec.js rename to tests/functional/spec/list_collector/list_collector_content.spec.js index b4a6977c1a..c1c8e1ac44 100644 --- a/tests/functional/spec/list_collector_content.spec.js +++ b/tests/functional/spec/list_collector/list_collector_content.spec.js @@ -1,17 +1,17 @@ -import AnyOtherCompaniesOrBranchesPage from "../generated_pages/list_collector_content_page/any-other-companies-or-branches.page.js"; -import AnyCompaniesOrBranchesAddPage from "../generated_pages/list_collector_content_page/any-other-companies-or-branches-add.page.js"; -import AnyCompaniesOrBranchesRemovePage from "../generated_pages/list_collector_content_page/any-other-companies-or-branches-remove.page.js"; +import AnyOtherCompaniesOrBranchesPage from "../../generated_pages/list_collector_content_page/any-other-companies-or-branches.page.js"; +import AnyCompaniesOrBranchesAddPage from "../../generated_pages/list_collector_content_page/any-other-companies-or-branches-add.page.js"; +import AnyCompaniesOrBranchesRemovePage from "../../generated_pages/list_collector_content_page/any-other-companies-or-branches-remove.page.js"; -import AnyCompaniesOrBranchesPage from "../generated_pages/list_collector_content_page/any-companies-or-branches.page"; -import CompaniesSummaryPage from "../generated_pages/list_collector_content_page/section-companies-summary.page"; -import HubPage from "../base_pages/hub.page"; -import ResponsiblePartyQuestionPage from "../generated_pages/list_collector_content_page/responsible-party.page"; -import ListCollectorFirstRepeatingBlockPage from "../generated_pages/list_collector_content_page/companies-repeating-block-1-repeating-block.page"; -import ListCollectorSecondRepeatingBlockPage from "../generated_pages/list_collector_content_page/companies-repeating-block-2-repeating-block.page"; -import ListCollectorContentPage from "../generated_pages/list_collector_content_page/list-collector-content.page"; -import ListCollectorContentSectionSummaryPage from "../generated_pages/list_collector_content_page/section-list-collector-contents-summary.page"; -import ConfirmationCheckboxPage from "../generated_pages/list_collector_content_page/confirmation-checkbox.page"; -import { listItemComplete, click } from "../helpers"; +import AnyCompaniesOrBranchesPage from "../../generated_pages/list_collector_content_page/any-companies-or-branches.page"; +import CompaniesSummaryPage from "../../generated_pages/list_collector_content_page/section-companies-summary.page"; +import HubPage from "../../base_pages/hub.page"; +import ResponsiblePartyQuestionPage from "../../generated_pages/list_collector_content_page/responsible-party.page"; +import ListCollectorFirstRepeatingBlockPage from "../../generated_pages/list_collector_content_page/companies-repeating-block-1-repeating-block.page"; +import ListCollectorSecondRepeatingBlockPage from "../../generated_pages/list_collector_content_page/companies-repeating-block-2-repeating-block.page"; +import ListCollectorContentPage from "../../generated_pages/list_collector_content_page/list-collector-content.page"; +import ListCollectorContentSectionSummaryPage from "../../generated_pages/list_collector_content_page/section-list-collector-contents-summary.page"; +import ConfirmationCheckboxPage from "../../generated_pages/list_collector_content_page/confirmation-checkbox.page"; +import { listItemComplete, click } from "../../helpers"; describe("List Collector Section Summary and Summary Items", () => { describe("Given I launch the test list collector section summary items survey", () => { diff --git a/tests/functional/spec/list_collector_driving_question.spec.js b/tests/functional/spec/list_collector/list_collector_driving_question.spec.js similarity index 78% rename from tests/functional/spec/list_collector_driving_question.spec.js rename to tests/functional/spec/list_collector/list_collector_driving_question.spec.js index 6bcccff737..8af6566133 100644 --- a/tests/functional/spec/list_collector_driving_question.spec.js +++ b/tests/functional/spec/list_collector/list_collector_driving_question.spec.js @@ -1,10 +1,10 @@ -import { checkItemsInList, click } from "../helpers"; -import HubPage from "../base_pages/hub.page.js"; -import AnyoneUsuallyLiveAtPage from "../generated_pages/list_collector_driving_question/anyone-usually-live-at.page.js"; -import AnyoneElseLiveAtListCollectorPage from "../generated_pages/list_collector_driving_question/anyone-else-live-at.page.js"; -import AnyoneElseLiveAtListCollectorAddPage from "../generated_pages/list_collector_driving_question/anyone-else-live-at-add.page.js"; -import AnyoneElseLiveAtListCollectorRemovePage from "../generated_pages/list_collector_driving_question/anyone-else-live-at-remove.page.js"; -import SectionSummaryPage from "../generated_pages/list_collector_driving_question/section-summary.page.js"; +import { checkItemsInList, click } from "../../helpers"; +import HubPage from "../../base_pages/hub.page.js"; +import AnyoneUsuallyLiveAtPage from "../../generated_pages/list_collector_driving_question/anyone-usually-live-at.page.js"; +import AnyoneElseLiveAtListCollectorPage from "../../generated_pages/list_collector_driving_question/anyone-else-live-at.page.js"; +import AnyoneElseLiveAtListCollectorAddPage from "../../generated_pages/list_collector_driving_question/anyone-else-live-at-add.page.js"; +import AnyoneElseLiveAtListCollectorRemovePage from "../../generated_pages/list_collector_driving_question/anyone-else-live-at-remove.page.js"; +import SectionSummaryPage from "../../generated_pages/list_collector_driving_question/section-summary.page.js"; describe("List Collector Driving Question", () => { beforeEach("Load the survey", async () => { diff --git a/tests/functional/spec/list_collector_driving_question_checkbox.spec.js b/tests/functional/spec/list_collector/list_collector_driving_question_checkbox.spec.js similarity index 82% rename from tests/functional/spec/list_collector_driving_question_checkbox.spec.js rename to tests/functional/spec/list_collector/list_collector_driving_question_checkbox.spec.js index 8d0daba5b6..647ad20daa 100644 --- a/tests/functional/spec/list_collector_driving_question_checkbox.spec.js +++ b/tests/functional/spec/list_collector/list_collector_driving_question_checkbox.spec.js @@ -1,13 +1,13 @@ -import { checkItemsInList, click } from "../helpers"; -import HubPage from "../base_pages/hub.page.js"; -import PrimaryPersonListCollectorPage from "../generated_pages/list_collector_driving_checkbox/primary-person-list-collector.page.js"; -import PrimaryPersonListCollectorAddPage from "../generated_pages/list_collector_driving_checkbox/primary-person-list-collector-add.page.js"; -import AnyoneUsuallyLiveAtPage from "../generated_pages/list_collector_driving_checkbox/anyone-usually-live-at.page.js"; -import ListCollectorAddPage from "../generated_pages/list_collector_driving_checkbox/list-collector-add.page.js"; -import ListCollectorPage from "../generated_pages/list_collector_driving_checkbox/list-collector.page.js"; -import ListCollectorTemporaryAwayPage from "../generated_pages/list_collector_driving_checkbox/list-collector-temporary-away-stay.page"; -import ListCollectorTemporaryAwayAddPage from "../generated_pages/list_collector_driving_checkbox/list-collector-temporary-away-stay-add.page"; -import SummaryPage from "../generated_pages/list_collector_driving_checkbox/section-summary.page"; +import { checkItemsInList, click } from "../../helpers"; +import HubPage from "../../base_pages/hub.page.js"; +import PrimaryPersonListCollectorPage from "../../generated_pages/list_collector_driving_checkbox/primary-person-list-collector.page.js"; +import PrimaryPersonListCollectorAddPage from "../../generated_pages/list_collector_driving_checkbox/primary-person-list-collector-add.page.js"; +import AnyoneUsuallyLiveAtPage from "../../generated_pages/list_collector_driving_checkbox/anyone-usually-live-at.page.js"; +import ListCollectorAddPage from "../../generated_pages/list_collector_driving_checkbox/list-collector-add.page.js"; +import ListCollectorPage from "../../generated_pages/list_collector_driving_checkbox/list-collector.page.js"; +import ListCollectorTemporaryAwayPage from "../../generated_pages/list_collector_driving_checkbox/list-collector-temporary-away-stay.page"; +import ListCollectorTemporaryAwayAddPage from "../../generated_pages/list_collector_driving_checkbox/list-collector-temporary-away-stay-add.page"; +import SummaryPage from "../../generated_pages/list_collector_driving_checkbox/section-summary.page"; const beforeSetup = async () => { await browser.openQuestionnaire("test_list_collector_driving_checkbox.json"); diff --git a/tests/functional/spec/list_collector_primary_person.spec.js b/tests/functional/spec/list_collector/list_collector_primary_person.spec.js similarity index 86% rename from tests/functional/spec/list_collector_primary_person.spec.js rename to tests/functional/spec/list_collector/list_collector_primary_person.spec.js index 5e49bd5a98..b38c74eaa6 100644 --- a/tests/functional/spec/list_collector_primary_person.spec.js +++ b/tests/functional/spec/list_collector/list_collector_primary_person.spec.js @@ -1,13 +1,13 @@ -import ListCollectorPage from "../generated_pages/list_collector_primary_person/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/list_collector_primary_person/list-collector-add.page.js"; -import ListCollectorEditPage from "../generated_pages/list_collector_primary_person/list-collector-edit.page.js"; -import PrimaryPersonListCollectorPage from "../generated_pages/list_collector_primary_person/primary-person-list-collector.page.js"; -import PrimaryPersonListCollectorAddPage from "../generated_pages/list_collector_primary_person/primary-person-list-collector-add.page.js"; -import SectionSummaryPage from "../generated_pages/list_collector/section-summary.page.js"; -import { SubmitPage } from "../base_pages/submit.page.js"; -import ThankYouPage from "../base_pages/thank-you.page.js"; -import AnyoneUsuallyLiveAtPage from "../generated_pages/list_collector_primary_person/anyone-usually-live-at.page.js"; -import { click } from "../helpers"; +import ListCollectorPage from "../../generated_pages/list_collector_primary_person/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/list_collector_primary_person/list-collector-add.page.js"; +import ListCollectorEditPage from "../../generated_pages/list_collector_primary_person/list-collector-edit.page.js"; +import PrimaryPersonListCollectorPage from "../../generated_pages/list_collector_primary_person/primary-person-list-collector.page.js"; +import PrimaryPersonListCollectorAddPage from "../../generated_pages/list_collector_primary_person/primary-person-list-collector-add.page.js"; +import SectionSummaryPage from "../../generated_pages/list_collector/section-summary.page.js"; +import { SubmitPage } from "../../base_pages/submit.page.js"; +import ThankYouPage from "../../base_pages/thank-you.page.js"; +import AnyoneUsuallyLiveAtPage from "../../generated_pages/list_collector_primary_person/anyone-usually-live-at.page.js"; +import { click } from "../../helpers"; describe("Primary Person List Collector Survey", () => { describe("Given the user starts on the 'do you live here' question", () => { diff --git a/tests/functional/spec/list_collector_section_summary.spec.js b/tests/functional/spec/list_collector/list_collector_section_summary.spec.js similarity index 93% rename from tests/functional/spec/list_collector_section_summary.spec.js rename to tests/functional/spec/list_collector/list_collector_section_summary.spec.js index 1adb0ad1a8..48e17933e1 100644 --- a/tests/functional/spec/list_collector_section_summary.spec.js +++ b/tests/functional/spec/list_collector/list_collector_section_summary.spec.js @@ -1,16 +1,16 @@ -import AnyCompaniesOrBranchesDrivingQuestionPage from "../generated_pages/list_collector_section_summary/any-companies-or-branches.page.js"; -import AnyCompaniesOrBranchesPage from "../generated_pages/list_collector_section_summary/any-other-companies-or-branches.page.js"; -import AnyCompaniesOrBranchesAddPage from "../generated_pages/list_collector_section_summary/any-other-companies-or-branches-add.page.js"; -import AnyCompaniesOrBranchesRemovePage from "../generated_pages/list_collector_section_summary/any-other-companies-or-branches-remove.page.js"; -import SectionSummaryPage from "../generated_pages/list_collector_section_summary/section-companies-summary.page"; -import SectionSummaryTwoPage from "../generated_pages/list_collector_section_summary/section-household-summary.page"; -import UkBasedPage from "../generated_pages/list_collector_section_summary/confirmation-checkbox.page"; -import ListCollectorPage from "../generated_pages/list_collector_section_summary/list-collector.page"; -import HouseholderCheckboxPage from "../generated_pages/list_collector_section_summary/householder-checkbox.page"; -import SubmitPage from "../generated_pages/list_collector_section_summary/submit.page"; -import ThankYouPage from "../base_pages/thank-you.page"; -import ViewSubmittedResponsePage from "../generated_pages/list_collector_section_summary/view-submitted-response.page"; -import { click, listItemIds } from "../helpers"; +import AnyCompaniesOrBranchesDrivingQuestionPage from "../../generated_pages/list_collector_section_summary/any-companies-or-branches.page.js"; +import AnyCompaniesOrBranchesPage from "../../generated_pages/list_collector_section_summary/any-other-companies-or-branches.page.js"; +import AnyCompaniesOrBranchesAddPage from "../../generated_pages/list_collector_section_summary/any-other-companies-or-branches-add.page.js"; +import AnyCompaniesOrBranchesRemovePage from "../../generated_pages/list_collector_section_summary/any-other-companies-or-branches-remove.page.js"; +import SectionSummaryPage from "../../generated_pages/list_collector_section_summary/section-companies-summary.page"; +import SectionSummaryTwoPage from "../../generated_pages/list_collector_section_summary/section-household-summary.page"; +import UkBasedPage from "../../generated_pages/list_collector_section_summary/confirmation-checkbox.page"; +import ListCollectorPage from "../../generated_pages/list_collector_section_summary/list-collector.page"; +import HouseholderCheckboxPage from "../../generated_pages/list_collector_section_summary/householder-checkbox.page"; +import SubmitPage from "../../generated_pages/list_collector_section_summary/submit.page"; +import ThankYouPage from "../../base_pages/thank-you.page"; +import ViewSubmittedResponsePage from "../../generated_pages/list_collector_section_summary/view-submitted-response.page"; +import { click, listItemIds } from "../../helpers"; describe("List Collector Section Summary and Summary Items", () => { describe("Given I launch the test list collector section summary items survey", () => { diff --git a/tests/functional/spec/list_collector_variants.spec.js b/tests/functional/spec/list_collector/list_collector_variants.spec.js similarity index 86% rename from tests/functional/spec/list_collector_variants.spec.js rename to tests/functional/spec/list_collector/list_collector_variants.spec.js index 6bb3610d2a..43fb7a4f85 100644 --- a/tests/functional/spec/list_collector_variants.spec.js +++ b/tests/functional/spec/list_collector/list_collector_variants.spec.js @@ -1,11 +1,11 @@ -import { checkItemsInList, click } from "../helpers"; -import YouLiveHerePage from "../generated_pages/list_collector_variants/you-live-here-block.page.js"; -import ListCollectorPage from "../generated_pages/list_collector_variants/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/list_collector_variants/list-collector-add.page.js"; -import ListCollectorEditPage from "../generated_pages/list_collector_variants/list-collector-edit.page.js"; -import ListCollectorRemovePage from "../generated_pages/list_collector_variants/list-collector-remove.page.js"; -import { SubmitPage } from "../base_pages/submit.page.js"; -import ThankYouPage from "../base_pages/thank-you.page.js"; +import { checkItemsInList, click } from "../../helpers"; +import YouLiveHerePage from "../../generated_pages/list_collector_variants/you-live-here-block.page.js"; +import ListCollectorPage from "../../generated_pages/list_collector_variants/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/list_collector_variants/list-collector-add.page.js"; +import ListCollectorEditPage from "../../generated_pages/list_collector_variants/list-collector-edit.page.js"; +import ListCollectorRemovePage from "../../generated_pages/list_collector_variants/list-collector-remove.page.js"; +import { SubmitPage } from "../../base_pages/submit.page.js"; +import ThankYouPage from "../../base_pages/thank-you.page.js"; describe("List Collector With Variants", () => { describe("Given that a person lives in house", () => { diff --git a/tests/functional/spec/list_collector_variants_primary_person.spec.js b/tests/functional/spec/list_collector/list_collector_variants_primary_person.spec.js similarity index 88% rename from tests/functional/spec/list_collector_variants_primary_person.spec.js rename to tests/functional/spec/list_collector/list_collector_variants_primary_person.spec.js index 1d01495bf0..1e1d6b3ae6 100644 --- a/tests/functional/spec/list_collector_variants_primary_person.spec.js +++ b/tests/functional/spec/list_collector/list_collector_variants_primary_person.spec.js @@ -1,11 +1,11 @@ -import VariantBlockPage from "../generated_pages/list_collector_variants_primary_person/variant-block.page"; -import PrimaryPersonListCollectorPage from "../generated_pages/list_collector_variants_primary_person/primary-person-list-collector.page"; -import ListCollectorAddPage from "../generated_pages/list_collector_variants_primary_person/list-collector-add.page"; -import ListCollectorPage from "../generated_pages/list_collector_variants_primary_person/list-collector.page"; -import EditPersonPage from "../generated_pages/list_collector_variants_primary_person/list-collector-edit.page"; -import SubmitPage from "../generated_pages/list_collector_variants_primary_person/submit.page"; -import ThankYouPage from "../base_pages/thank-you.page.js"; -import { click } from "../helpers"; +import VariantBlockPage from "../../generated_pages/list_collector_variants_primary_person/variant-block.page"; +import PrimaryPersonListCollectorPage from "../../generated_pages/list_collector_variants_primary_person/primary-person-list-collector.page"; +import ListCollectorAddPage from "../../generated_pages/list_collector_variants_primary_person/list-collector-add.page"; +import ListCollectorPage from "../../generated_pages/list_collector_variants_primary_person/list-collector.page"; +import EditPersonPage from "../../generated_pages/list_collector_variants_primary_person/list-collector-edit.page"; +import SubmitPage from "../../generated_pages/list_collector_variants_primary_person/submit.page"; +import ThankYouPage from "../../base_pages/thank-you.page.js"; +import { click } from "../../helpers"; describe("List collector with variants primary person", () => { describe("Given that person lives in house", () => { diff --git a/tests/functional/spec/relationships-unrelated.spec.js b/tests/functional/spec/list_collector/relationships-unrelated.spec.js similarity index 89% rename from tests/functional/spec/relationships-unrelated.spec.js rename to tests/functional/spec/list_collector/relationships-unrelated.spec.js index 466d253b45..5f027bc70c 100644 --- a/tests/functional/spec/relationships-unrelated.spec.js +++ b/tests/functional/spec/list_collector/relationships-unrelated.spec.js @@ -1,9 +1,9 @@ -import ListCollectorPage from "../generated_pages/relationships_unrelated/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/relationships_unrelated/list-collector-add.page.js"; -import RelationshipsPage from "../generated_pages/relationships_unrelated/relationships.page.js"; -import RelatedToAnyoneElsePage from "../generated_pages/relationships_unrelated/related-to-anyone-else.page.js"; -import RelationshipsInterstitialPage from "../generated_pages/relationships_unrelated/relationship-interstitial.page.js"; -import { click } from "../helpers"; +import ListCollectorPage from "../../generated_pages/relationships_unrelated/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/relationships_unrelated/list-collector-add.page.js"; +import RelationshipsPage from "../../generated_pages/relationships_unrelated/relationships.page.js"; +import RelatedToAnyoneElsePage from "../../generated_pages/relationships_unrelated/related-to-anyone-else.page.js"; +import RelationshipsInterstitialPage from "../../generated_pages/relationships_unrelated/relationship-interstitial.page.js"; +import { click } from "../../helpers"; describe("Unrelated Relationships", () => { const schema = "test_relationships_unrelated.json"; diff --git a/tests/functional/spec/relationships.spec.js b/tests/functional/spec/list_collector/relationships.spec.js similarity index 94% rename from tests/functional/spec/relationships.spec.js rename to tests/functional/spec/list_collector/relationships.spec.js index eed441f469..8efd56015c 100644 --- a/tests/functional/spec/relationships.spec.js +++ b/tests/functional/spec/list_collector/relationships.spec.js @@ -1,10 +1,10 @@ -import ListCollectorPage from "../generated_pages/relationships/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/relationships/list-collector-add.page.js"; -import ListCollectorRemovePage from "../generated_pages/relationships/list-collector-remove.page.js"; -import RelationshipsPage from "../generated_pages/relationships/relationships.page.js"; -import RelationshipsInterstitialPage from "../generated_pages/relationships/relationship-interstitial.page.js"; -import SectionSummaryPage from "../generated_pages/relationships/section-summary.page.js"; -import { click } from "../helpers"; +import ListCollectorPage from "../../generated_pages/relationships/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/relationships/list-collector-add.page.js"; +import ListCollectorRemovePage from "../../generated_pages/relationships/list-collector-remove.page.js"; +import RelationshipsPage from "../../generated_pages/relationships/relationships.page.js"; +import RelationshipsInterstitialPage from "../../generated_pages/relationships/relationship-interstitial.page.js"; +import SectionSummaryPage from "../../generated_pages/relationships/section-summary.page.js"; +import { click } from "../../helpers"; describe("Relationships", () => { const schema = "test_relationships.json"; diff --git a/tests/functional/spec/relationships_primary.spec.js b/tests/functional/spec/list_collector/relationships_primary.spec.js similarity index 86% rename from tests/functional/spec/relationships_primary.spec.js rename to tests/functional/spec/list_collector/relationships_primary.spec.js index 44b758c19d..ef696073f7 100644 --- a/tests/functional/spec/relationships_primary.spec.js +++ b/tests/functional/spec/list_collector/relationships_primary.spec.js @@ -1,9 +1,9 @@ -import PrimaryPersonListCollectorPage from "../generated_pages/relationships_primary/primary-person-list-collector.page.js"; -import PrimaryPersonListCollectorAddPage from "../generated_pages/relationships_primary/primary-person-list-collector-add.page.js"; -import ListCollectorPage from "../generated_pages/relationships_primary/list-collector.page.js"; -import ListCollectorAddPage from "../generated_pages/relationships_primary/list-collector-add.page.js"; -import RelationshipsPage from "../generated_pages/relationships_primary/relationships.page.js"; -import { click } from "../helpers"; +import PrimaryPersonListCollectorPage from "../../generated_pages/relationships_primary/primary-person-list-collector.page.js"; +import PrimaryPersonListCollectorAddPage from "../../generated_pages/relationships_primary/primary-person-list-collector-add.page.js"; +import ListCollectorPage from "../../generated_pages/relationships_primary/list-collector.page.js"; +import ListCollectorAddPage from "../../generated_pages/relationships_primary/list-collector-add.page.js"; +import RelationshipsPage from "../../generated_pages/relationships_primary/relationships.page.js"; +import { click } from "../../helpers"; describe("Relationships - Primary Person", () => { const schema = "test_relationships_primary.json"; diff --git a/tests/functional/spec/features/calculated_summary/calculated_summary.spec.js b/tests/functional/spec/summaries/calculated_summary/calculated_summary.spec.js similarity index 100% rename from tests/functional/spec/features/calculated_summary/calculated_summary.spec.js rename to tests/functional/spec/summaries/calculated_summary/calculated_summary.spec.js diff --git a/tests/functional/spec/features/calculated_summary/calculated_summary_test_case.js b/tests/functional/spec/summaries/calculated_summary/calculated_summary_test_case.js similarity index 100% rename from tests/functional/spec/features/calculated_summary/calculated_summary_test_case.js rename to tests/functional/spec/summaries/calculated_summary/calculated_summary_test_case.js diff --git a/tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_and_static_answers.spec.js b/tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_and_static_answers.spec.js similarity index 100% rename from tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_and_static_answers.spec.js rename to tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_and_static_answers.spec.js diff --git a/tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_blocks.spec.js b/tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_blocks.spec.js similarity index 100% rename from tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_blocks.spec.js rename to tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_blocks.spec.js diff --git a/tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_section.spec.js b/tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_section.spec.js similarity index 100% rename from tests/functional/spec/features/calculated_summary/new_calculated_summary_repeating_section.spec.js rename to tests/functional/spec/summaries/calculated_summary/new_calculated_summary_repeating_section.spec.js diff --git a/tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_cross_section_dependencies.spec.js b/tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_cross_section_dependencies.spec.js similarity index 100% rename from tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_cross_section_dependencies.spec.js rename to tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_cross_section_dependencies.spec.js diff --git a/tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_inside_repeating_section.spec.js b/tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_inside_repeating_section.spec.js similarity index 100% rename from tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_inside_repeating_section.spec.js rename to tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_inside_repeating_section.spec.js diff --git a/tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_overlapping_answers.spec.js b/tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_overlapping_answers.spec.js similarity index 100% rename from tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_overlapping_answers.spec.js rename to tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_overlapping_answers.spec.js diff --git a/tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_repeating_answers.spec.js b/tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_repeating_answers.spec.js similarity index 100% rename from tests/functional/spec/features/grand_calculated_summary/grand_calculated_summary_repeating_answers.spec.js rename to tests/functional/spec/summaries/grand_calculated_summary/grand_calculated_summary_repeating_answers.spec.js diff --git a/tests/functional/spec/features/question_summary/custom_question_summary.spec.js b/tests/functional/spec/summaries/question_summary/custom_question_summary.spec.js similarity index 100% rename from tests/functional/spec/features/question_summary/custom_question_summary.spec.js rename to tests/functional/spec/summaries/question_summary/custom_question_summary.spec.js diff --git a/tests/functional/spec/features/section_summary/section_summary.spec.js b/tests/functional/spec/summaries/section_summary/section_summary.spec.js similarity index 100% rename from tests/functional/spec/features/section_summary/section_summary.spec.js rename to tests/functional/spec/summaries/section_summary/section_summary.spec.js diff --git a/tests/functional/spec/features/section_summary/section_summary_repeating_sections.spec.js b/tests/functional/spec/summaries/section_summary/section_summary_repeating_sections.spec.js similarity index 100% rename from tests/functional/spec/features/section_summary/section_summary_repeating_sections.spec.js rename to tests/functional/spec/summaries/section_summary/section_summary_repeating_sections.spec.js diff --git a/tests/functional/spec/features/show_section_summary_on_completion/show_section_summary_on_completion.spec.js b/tests/functional/spec/summaries/show_section_summary_on_completion/show_section_summary_on_completion.spec.js similarity index 100% rename from tests/functional/spec/features/show_section_summary_on_completion/show_section_summary_on_completion.spec.js rename to tests/functional/spec/summaries/show_section_summary_on_completion/show_section_summary_on_completion.spec.js diff --git a/tests/functional/wdio.conf.js b/tests/functional/wdio.conf.js index 74dd7065b9..be5a2971fb 100644 --- a/tests/functional/wdio.conf.js +++ b/tests/functional/wdio.conf.js @@ -23,6 +23,9 @@ export const config = { timeout_modal_extended_new_window: ["./spec/timeout/timeout_modal_extended_new_window/*.js"], components: ["./spec/components/**/*.js"], features: ["./spec/features/**/*.js"], + summaries: ["./spec/summaries/**/*.js"], + journeys: ["./spec/journeys/**/*.js"], + list_collector: ["./spec/list_collector/**/*.js"], general: ["./spec/*.spec.js"], }, // Patterns to exclude.