Skip to content

Commit

Permalink
Rename integration test helper
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mtaylorgds committed Jul 16, 2024
1 parent 509b574 commit 6325b26
Show file tree
Hide file tree
Showing 35 changed files with 70 additions and 70 deletions.
4 changes: 2 additions & 2 deletions test/integration/add_artefact_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/adding_parts_to_guides_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/adding_variants_to_transactions_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/change_edition_type_test.rb
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/integration/completed_transactions_create_edit_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/delete_edition_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/downtime_integration_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "integration_test_helper"
require "legacy_integration_test_helper"

class DowntimeIntegrationTest < JavascriptIntegrationTest
class DowntimeIntegrationTest < LegacyJavascriptIntegrationTest
setup do
setup_users

Expand Down
4 changes: 2 additions & 2 deletions test/integration/downtime_with_invalid_dates_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "integration_test_helper"
require "legacy_integration_test_helper"

class DowntimeWithInvalidDates < PublisherIntegrationTest
class DowntimeWithInvalidDates < LegacyPublisherIntegrationTest
setup do
setup_users

Expand Down
4 changes: 2 additions & 2 deletions test/integration/edit_artefact_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_history_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_link_check_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_major_change_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_scheduled_publishing_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_tab_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/edition_workflow_test.rb
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/integration/fact_check_email_test.rb
Original file line number Diff line number Diff line change
@@ -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, "[email protected]")
Expand Down
4 changes: 2 additions & 2 deletions test/integration/guide_create_edit_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/healthcheck_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/help_page_create_edit_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/homepage_popular_links_test.rb
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions test/integration/legacy_redirect_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/local_transaction_create_edit_test.rb
Original file line number Diff line number Diff line change
@@ -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])

Expand Down
4 changes: 2 additions & 2 deletions test/integration/mark_edition_in_beta_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/previous_edition_differences_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/request_tracing_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/root_overview_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/routes_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/simple_smart_answers_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/skip_review_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/tagging_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/transaction_create_edit_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/unpublish_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/user_search_test.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/unit/edition_churn_presenter_test.rb
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

0 comments on commit 6325b26

Please sign in to comment.