diff options
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/system_test_case.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/system_testing/base.rb | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/actionpack/lib/system_test_case.rb b/actionpack/lib/system_test_case.rb index 3a621fb6f0..2072a88d22 100644 --- a/actionpack/lib/system_test_case.rb +++ b/actionpack/lib/system_test_case.rb @@ -1,7 +1,11 @@ -require 'system_testing/base' +require 'system_testing/test_helper' +require 'system_testing/driver_adapter' module Rails class SystemTestCase < ActionDispatch::IntegrationTest - include SystemTesting::Base + include SystemTesting::TestHelper + include SystemTesting::DriverAdapter + + ActiveSupport.run_load_hooks(:system_testing, self) end end diff --git a/actionpack/lib/system_testing/base.rb b/actionpack/lib/system_testing/base.rb deleted file mode 100644 index 770342da82..0000000000 --- a/actionpack/lib/system_testing/base.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'system_testing/test_helper' -require 'system_testing/driver_adapter' - -module SystemTesting - module Base - include TestHelper - include DriverAdapter - - ActiveSupport.run_load_hooks(:system_testing, self) - end -end |