These tests are trusting in the order of the elements so use OrderedHash instead of Hash

1 files changed, 9 insertions, 13 deletions

diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 048f96c9a9..d59bbec4a9 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'abstract_unit'
-require 'active_support/ordered_options'
+require 'active_support/ordered_hash'
 require 'controller/fake_controllers'
 
 class UrlHelperTest < ActiveSupport::TestCase
@@ -31,17 +31,13 @@ class UrlHelperTest < ActiveSupport::TestCase
     {}
   end
 
-  def abcd(hash = {})
-    hash_for(:a => :b, :c => :d).merge(hash)
-  end
-
-  def hash_for(opts = {})
-    {:controller => "foo", :action => "bar"}.merge(opts)
+  def hash_for(opts = [])
+    ActiveSupport::OrderedHash[*([:controller, "foo", :action, "bar"].concat(opts))]
   end
   alias url_hash hash_for
 
   def test_url_for_does_not_escape_urls
-    assert_equal "/?a=b&c=d", url_for(abcd)
+    assert_equal "/?a=b&c=d", url_for(hash_for([:a, :b, :c, :d]))
   end
 
   def test_url_for_with_back
@@ -128,7 +124,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_with_host_option
-    hash = hash_for(:host => "www.example.com")
+    hash = hash_for([:host, "www.example.com"])
     expected = %q{<a href="http://www.example.com/">Test Link</a>}
     assert_dom_equal(expected, link_to('Test Link', hash))
   end
@@ -294,7 +290,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_current_page_with_params_that_match
     @request = request_for_url("/?order=desc&page=1")
 
-    assert current_page?(hash_for(:order => "desc", :page => "1"))
+    assert current_page?(hash_for([:order, "desc", :page, "1"]))
     assert current_page?("http://www.example.com/?order=desc&page=1")
   end
 
@@ -316,20 +312,20 @@ class UrlHelperTest < ActiveSupport::TestCase
     @request = request_for_url("/?order=desc&page=1")
 
     assert_equal "Showing",
-      link_to_unless_current("Showing", hash_for(:order=>'desc', :page=>'1'))
+      link_to_unless_current("Showing", hash_for([:order, 'desc', :page, '1']))
     assert_equal "Showing",
       link_to_unless_current("Showing", "http://www.example.com/?order=desc&page=1")
 
     @request = request_for_url("/?order=desc")
 
     assert_equal %{<a href="/?order=asc">Showing</a>},
-      link_to_unless_current("Showing", hash_for(:order => :asc))
+      link_to_unless_current("Showing", hash_for([:order, :asc]))
     assert_equal %{<a href="http://www.example.com/?order=asc">Showing</a>},
       link_to_unless_current("Showing", "http://www.example.com/?order=asc")
 
     @request = request_for_url("/?order=desc")
     assert_equal %{<a href="/?order=desc&amp;page=2\">Showing</a>},
-      link_to_unless_current("Showing", hash_for(:order => "desc", :page => 2))
+      link_to_unless_current("Showing", hash_for([:order, "desc", :page, 2]))
     assert_equal %{<a href="http://www.example.com/?order=desc&amp;page=2">Showing</a>},
       link_to_unless_current("Showing", "http://www.example.com/?order=desc&page=2")