aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEdouard CHIN <edouard.chin@shopify.com>2019-07-24 00:28:57 +0200
committerEdouard CHIN <edouard.chin@shopify.com>2019-07-24 01:18:00 +0200
commite6cf57df8a609c697c0bc593576f06895414da64 (patch)
tree740cc8de112a7fa6b57b8f289b5208995c2d5646 /actionpack
parent31105c81cc82ae829c382a4eee2c5aa362882dea (diff)
downloadrails-e6cf57df8a609c697c0bc593576f06895414da64.tar.gz
rails-e6cf57df8a609c697c0bc593576f06895414da64.tar.bz2
rails-e6cf57df8a609c697c0bc593576f06895414da64.zip
Define the `url_options` needed for SytemTest inside the route proxy:
- I made a change in https://github.com/rails/rails/pull/36691 to delegate route helper to a proxy class. This didn't take into account that the `url_options` we redefine in SystemTest would be ignored. This PR fixes that by definin the url_options inside the proxy
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/system_test_case.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb
index 9772beb8aa..4fda2cf44f 100644
--- a/actionpack/lib/action_dispatch/system_test_case.rb
+++ b/actionpack/lib/action_dispatch/system_test_case.rb
@@ -120,7 +120,13 @@ module ActionDispatch
super
self.class.driver.use
@proxy_route = if ActionDispatch.test_app
- Class.new { include ActionDispatch.test_app.routes.url_helpers }.new
+ Class.new do
+ include ActionDispatch.test_app.routes.url_helpers
+
+ def url_options
+ default_url_options.merge(host: Capybara.app_host)
+ end
+ end.new
else
nil
end
@@ -164,10 +170,6 @@ module ActionDispatch
driven_by :selenium
- def url_options # :nodoc:
- default_url_options.merge(host: Capybara.app_host)
- end
-
def method_missing(method, *args, &block)
if @proxy_route.respond_to?(method)
@proxy_route.send(method, *args, &block)