aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-04-08 22:43:22 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2012-04-08 22:44:37 -0300
commit500c9a161c10e95b8d3c8a63a57da673ddf3da3c (patch)
treeb82ceae3eda1cbd7ed52fe9d80a7322df2b7081d /actionpack/test/controller
parent6ddbd1844a6fd6aca2992f5f75c9f605cf89808f (diff)
downloadrails-500c9a161c10e95b8d3c8a63a57da673ddf3da3c.tar.gz
rails-500c9a161c10e95b8d3c8a63a57da673ddf3da3c.tar.bz2
rails-500c9a161c10e95b8d3c8a63a57da673ddf3da3c.zip
Revert "Merge pull request #5750 from ahoward/master"
This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a. The reverted commit improved the performance in the wrong place, now we have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/url_for_test.rb18
1 files changed, 0 insertions, 18 deletions
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 04a431c5c9..aa233d6135 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -356,24 +356,6 @@ module AbstractController
assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
end
- def test_with_stringified_default_url_options
- W.default_url_options['controller'] = 'd'
- W.default_url_options['only_path'] = false
- assert_equal("/c", W.new.url_for(:controller => 'c', :only_path => true))
-
- W.default_url_options['action'] = 'b'
- assert_equal("/c/a", W.new.url_for(:controller => 'c', :action => 'a', :only_path => true))
- end
-
- def test_with_stringified_default_url_options_and_without_options
- W.default_url_options['controller'] = 'c'
- W.default_url_options['only_path'] = true
- assert_equal("/c", W.new.url_for)
-
- W.default_url_options['action'] = 'a'
- assert_equal("/c/a", W.new.url_for)
- end
-
def test_url_params_with_nil_to_param_are_not_in_url
assert_equal("/c/a", W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :id => Struct.new(:to_param).new(nil)))
end