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.
rails · Feb 20, 2017 · d63cfa2 · d63cfa2
1 parent faba250
commit d63cfa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git 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