aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/system_testing/test_helpers
diff options
context:
space:
mode:
authorLeonel Galán <leonel@getstealz.com>2017-06-16 15:09:15 -0400
committerGitHub <noreply@github.com>2017-06-16 15:09:15 -0400
commit095036467e4e06e56452da94077500d428dd0eed (patch)
tree3443e6779bf5a1d0f73f3c6ceb5f22cdee12e303 /actionpack/lib/action_dispatch/system_testing/test_helpers
parent0804e58e1e6a52190a950f863622102b6b21ccb8 (diff)
parentb55cf266f9ccadf49276de230a8b0c2076f05202 (diff)
downloadrails-095036467e4e06e56452da94077500d428dd0eed.tar.gz
rails-095036467e4e06e56452da94077500d428dd0eed.tar.bz2
rails-095036467e4e06e56452da94077500d428dd0eed.zip
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'actionpack/lib/action_dispatch/system_testing/test_helpers')
-rw-r--r--actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
index 187ba2cc5f..f03f0d4299 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
@@ -2,7 +2,12 @@ module ActionDispatch
module SystemTesting
module TestHelpers
module SetupAndTeardown # :nodoc:
- DEFAULT_HOST = "127.0.0.1"
+ DEFAULT_HOST = "http://127.0.0.1"
+
+ def host!(host)
+ super
+ Capybara.app_host = host
+ end
def before_setup
host! DEFAULT_HOST