diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index cceeb27c5..ea3b6dff5 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -3,7 +3,18 @@ require 'test_helper' require 'database_cleaner' require 'selenium/webdriver' -ApplicationSystemTestCase = Class.new(ApplicationIntegrationTest) +class ApplicationSystemTestCase < ActionDispatch::IntegrationTest + include Capybara::DSL + include Capybara::Minitest::Assertions + include AbstractController::Translation + include Devise::Test::IntegrationHelpers + + teardown do + WebMock.reset! + Capybara.reset_sessions! + Capybara.use_default_driver + end +end class JavaScriptApplicationSystemTestCase < ApplicationSystemTestCase self.use_transactional_fixtures = false diff --git a/test/system/admin_area/api_users/new_test.rb b/test/system/admin_area/api_users/new_test.rb index aed012fdc..d34b990c2 100644 --- a/test/system/admin_area/api_users/new_test.rb +++ b/test/system/admin_area/api_users/new_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaNewApiUserTest < ApplicationSystemTestCase setup do diff --git a/test/system/admin_area/contact_versions_test.rb b/test/system/admin_area/contact_versions_test.rb index 5028b83fe..88d625c41 100644 --- a/test/system/admin_area/contact_versions_test.rb +++ b/test/system/admin_area/contact_versions_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class ContactVersionsTest < ApplicationSystemTestCase def setup diff --git a/test/system/admin_area/contacts_test.rb b/test/system/admin_area/contacts_test.rb index 7ace0b7ec..d98882dff 100644 --- a/test/system/admin_area/contacts_test.rb +++ b/test/system/admin_area/contacts_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminContactsTest < ApplicationSystemTestCase def setup diff --git a/test/system/admin_area/domain_versions_test.rb b/test/system/admin_area/domain_versions_test.rb index 0d7637f45..b4e3daec8 100644 --- a/test/system/admin_area/domain_versions_test.rb +++ b/test/system/admin_area/domain_versions_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class DomainVersionsTest < ApplicationSystemTestCase def setup diff --git a/test/system/admin_area/domains/details_test.rb b/test/system/admin_area/domains/details_test.rb index 49fada58e..835d213b3 100644 --- a/test/system/admin_area/domains/details_test.rb +++ b/test/system/admin_area/domains/details_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaDomainDetailsTest < ApplicationSystemTestCase setup do diff --git a/test/system/admin_area/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb index 561e4d47a..5e135bf24 100644 --- a/test/system/admin_area/domains/force_delete_test.rb +++ b/test/system/admin_area/domains/force_delete_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase include ActionMailer::TestHelper diff --git a/test/system/admin_area/domains/registry_lock_test.rb b/test/system/admin_area/domains/registry_lock_test.rb index 027ca8ecc..6a34c23b4 100644 --- a/test/system/admin_area/domains/registry_lock_test.rb +++ b/test/system/admin_area/domains/registry_lock_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaRegistryLockTest < JavaScriptApplicationSystemTestCase def setup diff --git a/test/system/admin_area/domains_test.rb b/test/system/admin_area/domains_test.rb index f89c21ed6..abd1d93fb 100644 --- a/test/system/admin_area/domains_test.rb +++ b/test/system/admin_area/domains_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminDomainsTestTest < ApplicationSystemTestCase setup do diff --git a/test/system/admin_area/invoices_test.rb b/test/system/admin_area/invoices_test.rb index 8fef3cddb..814f95d4a 100644 --- a/test/system/admin_area/invoices_test.rb +++ b/test/system/admin_area/invoices_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaInvoicesTest < ApplicationSystemTestCase include ActionMailer::TestHelper diff --git a/test/system/admin_area/protected_area_test.rb b/test/system/admin_area/protected_area_test.rb index 9390348f0..f3375776a 100644 --- a/test/system/admin_area/protected_area_test.rb +++ b/test/system/admin_area/protected_area_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaProtectedAreaTest < ApplicationSystemTestCase def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area diff --git a/test/system/admin_area/registrars_test.rb b/test/system/admin_area/registrars_test.rb index 3d3e1c4f0..0982fe624 100644 --- a/test/system/admin_area/registrars_test.rb +++ b/test/system/admin_area/registrars_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminRegistrarsSystemTest < ApplicationSystemTestCase include ActionView::Helpers::NumberHelper diff --git a/test/system/admin_area/reserved_domains/new_test.rb b/test/system/admin_area/reserved_domains/new_test.rb index 05b740b86..a6a5a9bfd 100644 --- a/test/system/admin_area/reserved_domains/new_test.rb +++ b/test/system/admin_area/reserved_domains/new_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaReservedDomainsNewTest < ApplicationSystemTestCase setup do diff --git a/test/system/admin_area/sign_in_test.rb b/test/system/admin_area/sign_in_test.rb index dd264aa5e..67a3f0d36 100644 --- a/test/system/admin_area/sign_in_test.rb +++ b/test/system/admin_area/sign_in_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaSignInTest < ApplicationSystemTestCase setup do diff --git a/test/system/admin_area/sign_out_test.rb b/test/system/admin_area/sign_out_test.rb index f85ea0bd2..45a60b12c 100644 --- a/test/system/admin_area/sign_out_test.rb +++ b/test/system/admin_area/sign_out_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class AdminAreaSignOutTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrant_area/contacts/details_test.rb b/test/system/registrant_area/contacts/details_test.rb index 1198de6c4..8152939a5 100644 --- a/test/system/registrant_area/contacts/details_test.rb +++ b/test/system/registrant_area/contacts/details_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrantAreaContactDetailsTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrant_area/contacts/update_test.rb b/test/system/registrant_area/contacts/update_test.rb index 897600cd9..f56e117ed 100644 --- a/test/system/registrant_area/contacts/update_test.rb +++ b/test/system/registrant_area/contacts/update_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrantAreaContactUpdateTest < ApplicationIntegrationTest setup do diff --git a/test/system/registrant_area/domains/details_test.rb b/test/system/registrant_area/domains/details_test.rb index ef9197541..5b2e30ba3 100644 --- a/test/system/registrant_area/domains/details_test.rb +++ b/test/system/registrant_area/domains/details_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrantAreaDomainDetailsTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrant_area/domains/list_test.rb b/test/system/registrant_area/domains/list_test.rb index 54ca979b3..805b130de 100644 --- a/test/system/registrant_area/domains/list_test.rb +++ b/test/system/registrant_area/domains/list_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' CompanyRegisterClientStub = Struct.new(:any_method) do def representation_rights(citizen_personal_code:, citizen_country_code:) diff --git a/test/system/registrant_area/domains_test.rb b/test/system/registrant_area/domains_test.rb index 175cb61ae..fa151c89e 100644 --- a/test/system/registrant_area/domains_test.rb +++ b/test/system/registrant_area/domains_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrantDomainsTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrant_area/layout_test.rb b/test/system/registrant_area/layout_test.rb index 0fedaaefe..9df8028e3 100644 --- a/test/system/registrant_area/layout_test.rb +++ b/test/system/registrant_area/layout_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrantLayoutTest < ApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/account_test.rb b/test/system/registrar_area/account_test.rb index 81db3ed4b..708f8dc8f 100644 --- a/test/system/registrar_area/account_test.rb +++ b/test/system/registrar_area/account_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAccountTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb index 2d44e8328..2614b8701 100644 --- a/test/system/registrar_area/billing/balance_top_up_test.rb +++ b/test/system/registrar_area/billing/balance_top_up_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class BalanceTopUpTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/bulk_change/bulk_transfer_test.rb b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb index 3a663a9bc..944a1f91f 100644 --- a/test/system/registrar_area/bulk_change/bulk_transfer_test.rb +++ b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/bulk_change/nameserver_test.rb b/test/system/registrar_area/bulk_change/nameserver_test.rb index c5789a969..b3f4e70c1 100644 --- a/test/system/registrar_area/bulk_change/nameserver_test.rb +++ b/test/system/registrar_area/bulk_change/nameserver_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/bulk_change/tech_contact_test.rb b/test/system/registrar_area/bulk_change/tech_contact_test.rb index 0b68b9db2..f14fc2208 100644 --- a/test/system/registrar_area/bulk_change/tech_contact_test.rb +++ b/test/system/registrar_area/bulk_change/tech_contact_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/domains_test.rb b/test/system/registrar_area/domains_test.rb index a01dd576b..00d5c9e43 100644 --- a/test/system/registrar_area/domains_test.rb +++ b/test/system/registrar_area/domains_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarDomainsTest < ApplicationSystemTestCase def test_downloads_domain_list_as_csv diff --git a/test/system/registrar_area/invoices/list_test.rb b/test/system/registrar_area/invoices/list_test.rb index b6d659a96..bb68acb2f 100644 --- a/test/system/registrar_area/invoices/list_test.rb +++ b/test/system/registrar_area/invoices/list_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class ListInvoicesTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb index 6933ff9ad..6366a418d 100644 --- a/test/system/registrar_area/invoices/new_invoice_payment_test.rb +++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class NewInvoicePaymentTest < ApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb index a5a72fbe8..26ab34385 100644 --- a/test/system/registrar_area/invoices/new_test.rb +++ b/test/system/registrar_area/invoices/new_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class NewInvoiceTest < ApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/invoices/payment_callback_test.rb b/test/system/registrar_area/invoices/payment_callback_test.rb index 62cdc1497..620c4a245 100644 --- a/test/system/registrar_area/invoices/payment_callback_test.rb +++ b/test/system/registrar_area/invoices/payment_callback_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class PaymentCallbackTest < ApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/invoices/payment_return_test.rb b/test/system/registrar_area/invoices/payment_return_test.rb index 6ecb69649..63e83a4b0 100644 --- a/test/system/registrar_area/invoices/payment_return_test.rb +++ b/test/system/registrar_area/invoices/payment_return_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class PaymentReturnTest < ApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/invoices_test.rb b/test/system/registrar_area/invoices_test.rb index 02df5da82..e64204165 100644 --- a/test/system/registrar_area/invoices_test.rb +++ b/test/system/registrar_area/invoices_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaInvoicesTest < ApplicationSystemTestCase include ActionMailer::TestHelper diff --git a/test/system/registrar_area/protected_area_test.rb b/test/system/registrar_area/protected_area_test.rb index f3ec06302..f1be6008d 100644 --- a/test/system/registrar_area/protected_area_test.rb +++ b/test/system/registrar_area/protected_area_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaProtectedAreaTest < ApplicationSystemTestCase def test_anonymous_user_is_asked_to_authenticate_when_navigating_to_protected_area diff --git a/test/system/registrar_area/settings/balance_auto_reload_test.rb b/test/system/registrar_area/settings/balance_auto_reload_test.rb index a5ad6dec1..066fb6186 100644 --- a/test/system/registrar_area/settings/balance_auto_reload_test.rb +++ b/test/system/registrar_area/settings/balance_auto_reload_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaSettingsBalanceAutoReloadTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/sign_in/mobile_id_test.rb b/test/system/registrar_area/sign_in/mobile_id_test.rb index ecca00c56..171172b2c 100644 --- a/test/system/registrar_area/sign_in/mobile_id_test.rb +++ b/test/system/registrar_area/sign_in/mobile_id_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaMobileIDSignInTest < JavaScriptApplicationSystemTestCase def setup diff --git a/test/system/registrar_area/sign_in/password_test.rb b/test/system/registrar_area/sign_in/password_test.rb index 433c56d9d..a362e98e3 100644 --- a/test/system/registrar_area/sign_in/password_test.rb +++ b/test/system/registrar_area/sign_in/password_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaPasswordSignInTest < ApplicationSystemTestCase setup do diff --git a/test/system/registrar_area/sign_out_test.rb b/test/system/registrar_area/sign_out_test.rb index 8fd48db21..040836600 100644 --- a/test/system/registrar_area/sign_out_test.rb +++ b/test/system/registrar_area/sign_out_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require 'application_system_test_case' class RegistrarAreaSignOutTest < ApplicationSystemTestCase setup do diff --git a/test/test_helper.rb b/test/test_helper.rb index cbcc8fb70..f36bd61f3 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -57,5 +57,3 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest Capybara.use_default_driver end end - -require 'application_system_test_case'