From d63cfa2738520392ec37b2f77302a6f9f6df1618 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Sat, 17 Sep 2016 09:36:02 -0400 Subject: Move SystemTesting::Base into SystemTestCase There's no real benefit to the using the `Base` class here because `SystemTestCase` is already a very small class. --- actionpack/lib/system_test_case.rb | 8 ++++++-- actionpack/lib/system_testing/base.rb | 11 ----------- 2 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 actionpack/lib/system_testing/base.rb (limited to 'actionpack/lib') 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 -- cgit v1.2.3