From 6325b2666bc4aa84fe905be930a4d4db7425af79 Mon Sep 17 00:00:00 2001
From: Mark Taylor <138604938+mtaylorgds@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:15:17 +0100
Subject: [PATCH] Rename integration test helper

Rename `integration_test_helper.rb` to
 `legacy_integration_test_helper.rb` and rename the contained classes
 `PublisherIntegrationTest` and `JavascriptIntegrationTest ` to
 `LegacyPublisherIntegrationTest ` and `LegacyJavascriptIntegrationTest`,
 respectively.

These classes will be replaced with new ones designed for pages that
 have been transitioned to use the GOV.UK Design System, and will be
 removed once the transition is complete.
---
 test/integration/add_artefact_test.rb                         | 4 ++--
 test/integration/adding_parts_to_guides_test.rb               | 4 ++--
 test/integration/adding_variants_to_transactions_test.rb      | 4 ++--
 test/integration/change_edition_type_test.rb                  | 4 ++--
 test/integration/completed_transactions_create_edit_test.rb   | 4 ++--
 test/integration/delete_edition_test.rb                       | 4 ++--
 test/integration/downtime_integration_test.rb                 | 4 ++--
 test/integration/downtime_with_invalid_dates_test.rb          | 4 ++--
 test/integration/edit_artefact_test.rb                        | 4 ++--
 test/integration/edition_history_test.rb                      | 4 ++--
 test/integration/edition_link_check_test.rb                   | 4 ++--
 test/integration/edition_major_change_test.rb                 | 4 ++--
 test/integration/edition_scheduled_publishing_test.rb         | 4 ++--
 test/integration/edition_tab_test.rb                          | 4 ++--
 test/integration/edition_workflow_test.rb                     | 4 ++--
 test/integration/fact_check_email_test.rb                     | 4 ++--
 test/integration/guide_create_edit_test.rb                    | 4 ++--
 test/integration/healthcheck_test.rb                          | 4 ++--
 test/integration/help_page_create_edit_test.rb                | 4 ++--
 test/integration/homepage_popular_links_test.rb               | 4 ++--
 test/integration/legacy_redirect_test.rb                      | 4 ++--
 test/integration/local_transaction_create_edit_test.rb        | 4 ++--
 test/integration/mark_edition_in_beta_test.rb                 | 4 ++--
 test/integration/previous_edition_differences_test.rb         | 4 ++--
 test/integration/request_tracing_test.rb                      | 4 ++--
 test/integration/root_overview_test.rb                        | 4 ++--
 test/integration/routes_test.rb                               | 4 ++--
 test/integration/simple_smart_answers_test.rb                 | 4 ++--
 test/integration/skip_review_test.rb                          | 4 ++--
 test/integration/tagging_test.rb                              | 4 ++--
 test/integration/transaction_create_edit_test.rb              | 4 ++--
 test/integration/unpublish_test.rb                            | 4 ++--
 test/integration/user_search_test.rb                          | 4 ++--
 ...ation_test_helper.rb => legacy_integration_test_helper.rb} | 4 ++--
 test/unit/edition_churn_presenter_test.rb                     | 4 ++--
 35 files changed, 70 insertions(+), 70 deletions(-)
 rename test/{integration_test_helper.rb => legacy_integration_test_helper.rb} (97%)

diff --git a/test/integration/add_artefact_test.rb b/test/integration/add_artefact_test.rb
index 7f5aa91b6..4cfcb2566 100644
--- a/test/integration/add_artefact_test.rb
+++ b/test/integration/add_artefact_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class AddArtefactTest < PublisherIntegrationTest
+class AddArtefactTest < LegacyPublisherIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/adding_parts_to_guides_test.rb b/test/integration/adding_parts_to_guides_test.rb
index 71f541864..4bbf1431e 100644
--- a/test/integration/adding_parts_to_guides_test.rb
+++ b/test/integration/adding_parts_to_guides_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class AddingPartsToGuidesTest < JavascriptIntegrationTest
+class AddingPartsToGuidesTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/adding_variants_to_transactions_test.rb b/test/integration/adding_variants_to_transactions_test.rb
index b0a279e0e..3d4568859 100644
--- a/test/integration/adding_variants_to_transactions_test.rb
+++ b/test/integration/adding_variants_to_transactions_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class AddingVariantsToTransactionsTest < JavascriptIntegrationTest
+class AddingVariantsToTransactionsTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/change_edition_type_test.rb b/test/integration/change_edition_type_test.rb
index 77aeb5dd8..03bbee3cb 100644
--- a/test/integration/change_edition_type_test.rb
+++ b/test/integration/change_edition_type_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class ChangeEditionTypeTest < JavascriptIntegrationTest
+class ChangeEditionTypeTest < LegacyJavascriptIntegrationTest
   setup do
     stub_linkables
     FactoryBot.create(:user, :govuk_editor)
diff --git a/test/integration/completed_transactions_create_edit_test.rb b/test/integration/completed_transactions_create_edit_test.rb
index 9913c5716..9782c64e7 100644
--- a/test/integration/completed_transactions_create_edit_test.rb
+++ b/test/integration/completed_transactions_create_edit_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class CompletedTransactionCreateEditTest < JavascriptIntegrationTest
+class CompletedTransactionCreateEditTest < LegacyJavascriptIntegrationTest
   setup do
     @artefact = FactoryBot.create(
       :artefact,
diff --git a/test/integration/delete_edition_test.rb b/test/integration/delete_edition_test.rb
index b21368f50..5142875fa 100644
--- a/test/integration/delete_edition_test.rb
+++ b/test/integration/delete_edition_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class DeleteEditionTest < PublisherIntegrationTest
+class DeleteEditionTest < LegacyPublisherIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/downtime_integration_test.rb b/test/integration/downtime_integration_test.rb
index 1639c4fcc..d133a4c1f 100644
--- a/test/integration/downtime_integration_test.rb
+++ b/test/integration/downtime_integration_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class DowntimeIntegrationTest < JavascriptIntegrationTest
+class DowntimeIntegrationTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
 
diff --git a/test/integration/downtime_with_invalid_dates_test.rb b/test/integration/downtime_with_invalid_dates_test.rb
index b6df0fe7e..4fdcee7c2 100644
--- a/test/integration/downtime_with_invalid_dates_test.rb
+++ b/test/integration/downtime_with_invalid_dates_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class DowntimeWithInvalidDates < PublisherIntegrationTest
+class DowntimeWithInvalidDates < LegacyPublisherIntegrationTest
   setup do
     setup_users
 
diff --git a/test/integration/edit_artefact_test.rb b/test/integration/edit_artefact_test.rb
index 1ad05a16c..c02e20020 100644
--- a/test/integration/edit_artefact_test.rb
+++ b/test/integration/edit_artefact_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditArtefactTest < PublisherIntegrationTest
+class EditArtefactTest < LegacyPublisherIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/edition_history_test.rb b/test/integration/edition_history_test.rb
index ca15946f5..8ac8aec83 100644
--- a/test/integration/edition_history_test.rb
+++ b/test/integration/edition_history_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditionHistoryTest < JavascriptIntegrationTest
+class EditionHistoryTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/edition_link_check_test.rb b/test/integration/edition_link_check_test.rb
index 611f03a87..825bd11bf 100644
--- a/test/integration/edition_link_check_test.rb
+++ b/test/integration/edition_link_check_test.rb
@@ -1,7 +1,7 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 require "gds_api/test_helpers/link_checker_api"
 
-class EditionLinkCheckTest < JavascriptIntegrationTest
+class EditionLinkCheckTest < LegacyJavascriptIntegrationTest
   include GdsApi::TestHelpers::LinkCheckerApi
 
   setup do
diff --git a/test/integration/edition_major_change_test.rb b/test/integration/edition_major_change_test.rb
index 05cca2d25..5e40711c7 100644
--- a/test/integration/edition_major_change_test.rb
+++ b/test/integration/edition_major_change_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditionMajorChangeTest < JavascriptIntegrationTest
+class EditionMajorChangeTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/edition_scheduled_publishing_test.rb b/test/integration/edition_scheduled_publishing_test.rb
index 6d2b449ae..761d808cc 100644
--- a/test/integration/edition_scheduled_publishing_test.rb
+++ b/test/integration/edition_scheduled_publishing_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditionScheduledPublishingTest < JavascriptIntegrationTest
+class EditionScheduledPublishingTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/edition_tab_test.rb b/test/integration/edition_tab_test.rb
index 848bf7694..239ccba3e 100644
--- a/test/integration/edition_tab_test.rb
+++ b/test/integration/edition_tab_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditionTabTest < JavascriptIntegrationTest
+class EditionTabTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/edition_workflow_test.rb b/test/integration/edition_workflow_test.rb
index 4d0daf0c8..ba198f9bc 100644
--- a/test/integration/edition_workflow_test.rb
+++ b/test/integration/edition_workflow_test.rb
@@ -1,7 +1,7 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 require "gds_api/test_helpers/calendars"
 
-class EditionWorkflowTest < JavascriptIntegrationTest
+class EditionWorkflowTest < LegacyJavascriptIntegrationTest
   include GdsApi::TestHelpers::Calendars
   attr_reader :alice, :bob, :guide
 
diff --git a/test/integration/fact_check_email_test.rb b/test/integration/fact_check_email_test.rb
index ee9f27d93..3c39c1faa 100644
--- a/test/integration/fact_check_email_test.rb
+++ b/test/integration/fact_check_email_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class FactCheckEmailTest < PublisherIntegrationTest
+class FactCheckEmailTest < LegacyPublisherIntegrationTest
   def fact_check_mail_for(edition, attrs = {})
     message = Mail.new do
       from    attrs.fetch(:from,    "foo@example.com")
diff --git a/test/integration/guide_create_edit_test.rb b/test/integration/guide_create_edit_test.rb
index 75d9f3dfa..c3605ea4f 100644
--- a/test/integration/guide_create_edit_test.rb
+++ b/test/integration/guide_create_edit_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class GuideCreateEditTest < JavascriptIntegrationTest
+class GuideCreateEditTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/healthcheck_test.rb b/test/integration/healthcheck_test.rb
index 73864eb40..fd377d20e 100644
--- a/test/integration/healthcheck_test.rb
+++ b/test/integration/healthcheck_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class HealthcheckTest < PublisherIntegrationTest
+class HealthcheckTest < LegacyPublisherIntegrationTest
   def json
     JSON.parse(response.body)
   end
diff --git a/test/integration/help_page_create_edit_test.rb b/test/integration/help_page_create_edit_test.rb
index 7af4c4ed7..fc657e1fe 100644
--- a/test/integration/help_page_create_edit_test.rb
+++ b/test/integration/help_page_create_edit_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class HelpPageCreateEditTest < JavascriptIntegrationTest
+class HelpPageCreateEditTest < LegacyJavascriptIntegrationTest
   setup do
     @artefact = FactoryBot.create(
       :artefact,
diff --git a/test/integration/homepage_popular_links_test.rb b/test/integration/homepage_popular_links_test.rb
index 4d9dc162b..5fbac40ea 100644
--- a/test/integration/homepage_popular_links_test.rb
+++ b/test/integration/homepage_popular_links_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class HomepagePopularLinksTest < JavascriptIntegrationTest
+class HomepagePopularLinksTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     @popular_links = FactoryBot.create(:popular_links, state: "published")
diff --git a/test/integration/legacy_redirect_test.rb b/test/integration/legacy_redirect_test.rb
index 8beb0b170..aacbce102 100644
--- a/test/integration/legacy_redirect_test.rb
+++ b/test/integration/legacy_redirect_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class LegacyRedirect < PublisherIntegrationTest
+class LegacyRedirect < LegacyPublisherIntegrationTest
   should "redirect requests for the old index to the new one" do
     get "/admin"
     assert_response :redirect
diff --git a/test/integration/local_transaction_create_edit_test.rb b/test/integration/local_transaction_create_edit_test.rb
index 5c793a4e4..98f540440 100644
--- a/test/integration/local_transaction_create_edit_test.rb
+++ b/test/integration/local_transaction_create_edit_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class LocalTransactionCreateEditTest < JavascriptIntegrationTest
+class LocalTransactionCreateEditTest < LegacyJavascriptIntegrationTest
   setup do
     LocalService.create!(lgsl_code: 1, providing_tier: %w[county unitary])
 
diff --git a/test/integration/mark_edition_in_beta_test.rb b/test/integration/mark_edition_in_beta_test.rb
index 49bd94259..396ef9187 100644
--- a/test/integration/mark_edition_in_beta_test.rb
+++ b/test/integration/mark_edition_in_beta_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class MarkEditionInBetaTest < JavascriptIntegrationTest
+class MarkEditionInBetaTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/previous_edition_differences_test.rb b/test/integration/previous_edition_differences_test.rb
index 4873f653c..627eb15c0 100644
--- a/test/integration/previous_edition_differences_test.rb
+++ b/test/integration/previous_edition_differences_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class PreviousEditionDifferencesTest < JavascriptIntegrationTest
+class PreviousEditionDifferencesTest < LegacyJavascriptIntegrationTest
   setup do
     stub_register_published_content
     setup_users
diff --git a/test/integration/request_tracing_test.rb b/test/integration/request_tracing_test.rb
index 290379357..124096d3f 100644
--- a/test/integration/request_tracing_test.rb
+++ b/test/integration/request_tracing_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class RequestTracingTest < PublisherIntegrationTest
+class RequestTracingTest < LegacyPublisherIntegrationTest
   setup do
     setup_users
     stub_register_published_content
diff --git a/test/integration/root_overview_test.rb b/test/integration/root_overview_test.rb
index a9c12733c..e1db10514 100644
--- a/test/integration/root_overview_test.rb
+++ b/test/integration/root_overview_test.rb
@@ -1,6 +1,6 @@
-require_relative "../integration_test_helper"
+require_relative "../legacy_integration_test_helper"
 
-class RootOverviewTest < PublisherIntegrationTest
+class RootOverviewTest < LegacyPublisherIntegrationTest
   setup do
     stub_holidays_used_by_fact_check
   end
diff --git a/test/integration/routes_test.rb b/test/integration/routes_test.rb
index 916e9a716..09df4444c 100644
--- a/test/integration/routes_test.rb
+++ b/test/integration/routes_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class RoutesTest < PublisherIntegrationTest
+class RoutesTest < LegacyPublisherIntegrationTest
   should "route to downtimes controller for edit downtime" do
     edition = FactoryBot.create(:edition)
     edition_id = edition.id.to_s
diff --git a/test/integration/simple_smart_answers_test.rb b/test/integration/simple_smart_answers_test.rb
index 7b7da02ba..faf384d5c 100644
--- a/test/integration/simple_smart_answers_test.rb
+++ b/test/integration/simple_smart_answers_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class SimpleSmartAnswersTest < JavascriptIntegrationTest
+class SimpleSmartAnswersTest < LegacyJavascriptIntegrationTest
   setup do
     @artefact = FactoryBot.create(
       :artefact,
diff --git a/test/integration/skip_review_test.rb b/test/integration/skip_review_test.rb
index a0b304ebf..5de084b00 100644
--- a/test/integration/skip_review_test.rb
+++ b/test/integration/skip_review_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class SkipReviewTest < JavascriptIntegrationTest
+class SkipReviewTest < LegacyJavascriptIntegrationTest
   setup do
     @permitted_user = FactoryBot.create(
       :user,
diff --git a/test/integration/tagging_test.rb b/test/integration/tagging_test.rb
index bf638eb8a..aa0d68ffc 100644
--- a/test/integration/tagging_test.rb
+++ b/test/integration/tagging_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class TaggingTest < JavascriptIntegrationTest
+class TaggingTest < LegacyJavascriptIntegrationTest
   setup do
     setup_users
     stub_linkables
diff --git a/test/integration/transaction_create_edit_test.rb b/test/integration/transaction_create_edit_test.rb
index 5e99d21c0..58827b2aa 100644
--- a/test/integration/transaction_create_edit_test.rb
+++ b/test/integration/transaction_create_edit_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class TransactionCreateEditTest < JavascriptIntegrationTest
+class TransactionCreateEditTest < LegacyJavascriptIntegrationTest
   setup do
     @artefact = FactoryBot.create(
       :artefact,
diff --git a/test/integration/unpublish_test.rb b/test/integration/unpublish_test.rb
index 0397a5024..129aa9716 100644
--- a/test/integration/unpublish_test.rb
+++ b/test/integration/unpublish_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class UnpublishTest < PublisherIntegrationTest
+class UnpublishTest < LegacyPublisherIntegrationTest
   setup do
     @artefact = FactoryBot.create(
       :artefact,
diff --git a/test/integration/user_search_test.rb b/test/integration/user_search_test.rb
index c18915346..ba67636b1 100644
--- a/test/integration/user_search_test.rb
+++ b/test/integration/user_search_test.rb
@@ -1,6 +1,6 @@
-require_relative "../integration_test_helper"
+require_relative "../legacy_integration_test_helper"
 
-class UserSearchTest < PublisherIntegrationTest
+class UserSearchTest < LegacyPublisherIntegrationTest
   setup do
     alice = FactoryBot.create(:user, name: "Alice", uid: "alice")
     GDS::SSO.test_user = alice
diff --git a/test/integration_test_helper.rb b/test/legacy_integration_test_helper.rb
similarity index 97%
rename from test/integration_test_helper.rb
rename to test/legacy_integration_test_helper.rb
index c966edac8..3ae88eccd 100644
--- a/test/integration_test_helper.rb
+++ b/test/legacy_integration_test_helper.rb
@@ -3,7 +3,7 @@
 require "capybara-select-2"
 require "support/govuk_test"
 
-class PublisherIntegrationTest < ActionDispatch::IntegrationTest
+class LegacyPublisherIntegrationTest < ActionDispatch::IntegrationTest
   include Capybara::DSL
   include CapybaraSelect2
   include CapybaraSelect2::Helpers
@@ -95,7 +95,7 @@ def self.with_and_without_javascript(&block)
   end
 end
 
-class JavascriptIntegrationTest < PublisherIntegrationTest
+class LegacyJavascriptIntegrationTest < LegacyPublisherIntegrationTest
   setup do
     Capybara.current_driver = Capybara.javascript_driver
   end
diff --git a/test/unit/edition_churn_presenter_test.rb b/test/unit/edition_churn_presenter_test.rb
index 1c860cdec..4cd31b35f 100644
--- a/test/unit/edition_churn_presenter_test.rb
+++ b/test/unit/edition_churn_presenter_test.rb
@@ -1,6 +1,6 @@
-require "integration_test_helper"
+require "legacy_integration_test_helper"
 
-class EditionChurnPresenterTest < PublisherIntegrationTest
+class EditionChurnPresenterTest < LegacyPublisherIntegrationTest
   should "provide a CSV export of the churn in editions" do
     document = FactoryBot.create(
       :artefact,