Permalink
Browse files

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.
  • Loading branch information...
eileencodes committed Sep 17, 2016
1 parent faba250 commit d63cfa2738520392ec37b2f77302a6f9f6df1618
Showing with 6 additions and 13 deletions.
  1. +6 −2 actionpack/lib/system_test_case.rb
  2. +0 −11 actionpack/lib/system_testing/base.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
@@ -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

0 comments on commit d63cfa2

Please sign in to comment.