Permalink
Browse files

Merge pull request #28160 from y-yagi/only_load_systemtestcase_if_pum…

…a_is_defined

Only load SystemTestCase if Puma is defined
  • Loading branch information...
eileencodes committed Feb 27, 2017
2 parents c4957f8 + a070dfa commit cbbbbcc3054bdf3e08dd01f24ba55a0b57eeed46
Showing with 2 additions and 2 deletions.
  1. +2 −2 railties/lib/rails/test_help.rb
@@ -11,7 +11,7 @@
require "active_support/testing/autorun"
-if defined?(Capbyara)
+if defined?(Capybara) && defined?(Puma)
require "action_dispatch/system_test_case"
end
@@ -49,7 +49,7 @@ def before_setup # :nodoc:
end
end
-if defined? Capybara
+if defined?(Capybara) && defined?(Puma)
class ActionDispatch::SystemTestCase
def before_setup # :nodoc:
@routes = Rails.application.routes

0 comments on commit cbbbbcc

Please sign in to comment.