diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-02-27 08:01:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 08:01:53 -0500 |
| commit | cbbbbcc3054bdf3e08dd01f24ba55a0b57eeed46 (patch) | |
| tree | d0e3cac9cd549028cc90b275a9a931b559d3abcc /railties | |
| parent | c4957f8c540698f44255402c6e1b3398da69c651 (diff) | |
| parent | a070dfa0c5b64084108977176b914ffb32ceac5f (diff) | |
| download | rails-cbbbbcc3054bdf3e08dd01f24ba55a0b57eeed46.tar.gz rails-cbbbbcc3054bdf3e08dd01f24ba55a0b57eeed46.tar.bz2 rails-cbbbbcc3054bdf3e08dd01f24ba55a0b57eeed46.zip | |
Merge pull request #28160 from y-yagi/only_load_systemtestcase_if_puma_is_defined
Only load SystemTestCase if Puma is defined
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/test_help.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 09931c108a..8e290239bd 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -11,7 +11,7 @@ require "rails/generators/test_case" require "active_support/testing/autorun" -if defined?(Capbyara) +if defined?(Capybara) && defined?(Puma) require "action_dispatch/system_test_case" end @@ -49,7 +49,7 @@ class ActionDispatch::IntegrationTest end end -if defined? Capybara +if defined?(Capybara) && defined?(Puma) class ActionDispatch::SystemTestCase def before_setup # :nodoc: @routes = Rails.application.routes |