diff options
author | Matthew Draper <matthew@trebex.net> | 2017-05-24 13:53:09 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 13:53:09 +0930 |
commit | ef763d6933e35f1c4700597e7489f748a53c9390 (patch) | |
tree | 2b40e7b510585f124e46856265bf8196244e080c | |
parent | fc0682fb076be0847a21385663de4d0c39dbd231 (diff) | |
parent | 4c94d3e0a09151a84c5bc1eb044b082e2b07993f (diff) | |
download | rails-ef763d6933e35f1c4700597e7489f748a53c9390.tar.gz rails-ef763d6933e35f1c4700597e7489f748a53c9390.tar.bz2 rails-ef763d6933e35f1c4700597e7489f748a53c9390.zip |
Merge pull request #28644 from mtsmfm/set-capybara-app-host
Set `Capybara.app_host` through `host!`
-rw-r--r-- | actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb | 7 | ||||
-rw-r--r-- | actionpack/test/dispatch/system_testing/system_test_case_test.rb | 12 |
2 files changed, 18 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 diff --git a/actionpack/test/dispatch/system_testing/system_test_case_test.rb b/actionpack/test/dispatch/system_testing/system_test_case_test.rb index 33d98f924f..8f90e45f5f 100644 --- a/actionpack/test/dispatch/system_testing/system_test_case_test.rb +++ b/actionpack/test/dispatch/system_testing/system_test_case_test.rb @@ -19,3 +19,15 @@ class SetDriverToSeleniumTest < DrivenBySeleniumWithChrome assert_equal :selenium, Capybara.current_driver end end + +class SetHostTest < DrivenByRackTest + test "sets default host" do + assert_equal "http://127.0.0.1", Capybara.app_host + end + + test "overrides host" do + host! "http://example.com" + + assert_equal "http://example.com", Capybara.app_host + end +end |