aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2017-03-03 14:34:31 -0500
committereileencodes <eileencodes@gmail.com>2017-03-03 14:37:04 -0500
commitd3e7d91050da858bd5ec6a061b96466bd9ac85ef (patch)
tree0fabdf0915b7f6b7df18fc544da1283edd14eef8 /railties/lib/rails
parent76be78c59cd75eaafb31719745b43df4743fd33d (diff)
downloadrails-d3e7d91050da858bd5ec6a061b96466bd9ac85ef.tar.gz
rails-d3e7d91050da858bd5ec6a061b96466bd9ac85ef.tar.bz2
rails-d3e7d91050da858bd5ec6a061b96466bd9ac85ef.zip
Remove unnecessary system test code
It turns out that we don't need to require system tests in the railties test helper so we can remove it. If you're using system tests they will be loaded by inheriting from ActionDispatch::SystemTestCase and the routes will be loaded by ActionDispatch::IntegrationTest.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/test_help.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 8e290239bd..0f9bf98737 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -11,10 +11,6 @@ require "rails/generators/test_case"
require "active_support/testing/autorun"
-if defined?(Capybara) && defined?(Puma)
- require "action_dispatch/system_test_case"
-end
-
if defined?(ActiveRecord::Base)
ActiveRecord::Migration.maintain_test_schema!
@@ -48,12 +44,3 @@ class ActionDispatch::IntegrationTest
super
end
end
-
-if defined?(Capybara) && defined?(Puma)
- class ActionDispatch::SystemTestCase
- def before_setup # :nodoc:
- @routes = Rails.application.routes
- super
- end
- end
-end