diff options
| author | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-11 07:44:27 -0300 |
|---|---|---|
| committer | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-11 07:44:27 -0300 |
| commit | 99bd626885b72acd44861727918ee107a649e2b4 (patch) | |
| tree | 6d59fcdb226a65d9eb63f8bad2b2df7b09b92a60 /actionpack/test/controller/integration_test.rb | |
| parent | 4b60e34f58c0dabe18a793038fc7775d044016f6 (diff) | |
| parent | 6a278c6e9a05b0d901e482458cfc2e3df587d522 (diff) | |
| download | rails-99bd626885b72acd44861727918ee107a649e2b4.tar.gz rails-99bd626885b72acd44861727918ee107a649e2b4.tar.bz2 rails-99bd626885b72acd44861727918ee107a649e2b4.zip | |
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index b078e8ad9f..39ede1442a 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -542,6 +542,9 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest def with_test_route_set with_routing do |set| controller = ::IntegrationProcessTest::IntegrationController.clone + controller.class_eval do + include set.url_helpers + end set.draw do get "moved" => redirect("/method") @@ -552,10 +555,6 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest end end - controller.class_eval do - include set.url_helpers - end - singleton_class.include(set.url_helpers) yield |