Move from SystemTest to ApplicationSystemTestCase

rubygems · Oct 15, 2024 · 152a72a · 152a72a
1 parent 460c282
commit 152a72a
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 32 deletions.
diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class LocaleTest < SystemTest
+class LocaleTest < ActionDispatch::IntegrationTest
   test "html lang attribute is set from locale" do
     I18n.available_locales.each do |locale|
       visit root_path(locale: locale)

diff --git a/test/integration/email_confirmation_test.rb → test/system/email_confirmation_test.rb b/test/integration/email_confirmation_test.rb → test/system/email_confirmation_test.rb
@@ -1,7 +1,7 @@
-require "test_helper"
+require "application_system_test_case"
 require "helpers/email_helpers"
 
-class EmailConfirmationTest < SystemTest
+class EmailConfirmationTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
 
   setup do

diff --git a/test/integration/ownership_request_test.rb → test/system/ownership_request_test.rb b/test/integration/ownership_request_test.rb → test/system/ownership_request_test.rb
@@ -1,7 +1,7 @@
-require "test_helper"
+require "application_system_test_case"
 require "helpers/adoption_helpers"
 
-class OwnershipRequestsTest < SystemTest
+class OwnershipRequestsTest < ApplicationSystemTestCase
   include ActionMailer::TestHelper
   include AdoptionHelpers
 

diff --git a/test/integration/page_params_test.rb → test/system/page_params_test.rb b/test/integration/page_params_test.rb → test/system/page_params_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class PageParamsTest < SystemTest
+class PageParamsTest < ApplicationSystemTestCase
   include SearchKickHelper
 
   test "stats with page param more than 10" do

diff --git a/test/integration/pages_test.rb → test/system/pages_test.rb b/test/integration/pages_test.rb → test/system/pages_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class PagesTest < SystemTest
+class PagesTest < ApplicationSystemTestCase
   test "renders existing page" do
     visit "/"
     click_link "About"

diff --git a/test/integration/password_reset_test.rb → test/system/password_reset_test.rb b/test/integration/password_reset_test.rb → test/system/password_reset_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class PasswordResetTest < SystemTest
+class PasswordResetTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
 
   def password_reset_link

diff --git a/test/integration/profile_test.rb → test/system/profile_test.rb b/test/integration/profile_test.rb → test/system/profile_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class ProfileTest < SystemTest
+class ProfileTest < ApplicationSystemTestCase
   include ActiveJob::TestHelper
 
   setup do

diff --git a/test/integration/search_test.rb → test/system/search_test.rb b/test/integration/search_test.rb → test/system/search_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class SearchTest < SystemTest
+class SearchTest < ApplicationSystemTestCase
   include SearchKickHelper
 
   test "searching for a gem" do

diff --git a/test/integration/sign_in_test.rb → test/system/sign_in_test.rb b/test/integration/sign_in_test.rb → test/system/sign_in_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class SignInTest < SystemTest
+class SignInTest < ApplicationSystemTestCase
   setup do
     @user = create(:user, email: "[email protected]", password: PasswordHelpers::SECURE_TEST_PASSWORD, handle: nil)
     @mfa_user = create(:user, email: "[email protected]", password: PasswordHelpers::SECURE_TEST_PASSWORD,

diff --git a/test/integration/sign_up_test.rb → test/system/sign_up_test.rb b/test/integration/sign_up_test.rb → test/system/sign_up_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class SignUpTest < SystemTest
+class SignUpTest < ApplicationSystemTestCase
   test "sign up" do
     visit sign_up_path
 

diff --git a/test/integration/yank_test.rb → test/system/yank_test.rb b/test/integration/yank_test.rb → test/system/yank_test.rb
@@ -1,6 +1,6 @@
-require "test_helper"
+require "application_system_test_case"
 
-class YankTest < SystemTest
+class YankTest < ApplicationSystemTestCase
   setup do
     @user = create(:user, password: PasswordHelpers::SECURE_TEST_PASSWORD)
     @rubygem = create(:rubygem, name: "sandworm")

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -260,17 +260,6 @@ class ActionDispatch::IntegrationTest
 # Force loading of ActionDispatch::SystemTesting::* helpers
 _ = ActionDispatch::SystemTestCase
 
-class SystemTest < ActionDispatch::IntegrationTest
-  include Capybara::DSL
-  include Capybara::Minitest::Assertions
-  include ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
-  include ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
-
-  setup do
-    Capybara.current_driver = :rack_test
-  end
-end
-
 class AdminPolicyTestCase < ActiveSupport::TestCase
   def setup
     requires_avo_pro