aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorschneems <richard.schneeman+foo@gmail.com>2018-10-03 16:15:47 -0500
committerschneems <richard.schneeman+foo@gmail.com>2018-10-03 16:15:47 -0500
commit235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a (patch)
treee2fe7a8f9f6c877b3cfbdf3452d8cb943260d5ad /actionpack/test/controller
parentebf98df9fb705738ece08e3182d41e6f604be491 (diff)
downloadrails-235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a.tar.gz
rails-235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a.tar.bz2
rails-235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a.zip
Revert "Merge pull request #33970 from rails/eager-url-helpers"
Until #34050 can be resolved This reverts commit 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49, reversing changes made to 6556898884d636c59baae008e42783b8d3e16440.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/integration_test.rb7
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