Expectations first

1 files changed, 15 insertions, 15 deletions

diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 9f086af664..969129d9ba 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -231,8 +231,8 @@ module AbstractController
       def test_trailing_slash_with_params
         url = W.new.url_for(:trailing_slash => true, :only_path => true, :controller => 'cont', :action => 'act', :p1 => 'cafe', :p2 => 'link')
         params = extract_params(url)
-        assert_equal params[0], { :p1 => 'cafe' }.to_query
-        assert_equal params[1], { :p2 => 'link' }.to_query
+        assert_equal({p1: 'cafe'}.to_query, params[0])
+        assert_equal({p2: 'link'}.to_query, params[1])
       end
 
       def test_relative_url_root_is_respected
@@ -305,40 +305,40 @@ module AbstractController
       def test_two_parameters
         url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :p1 => 'X1', :p2 => 'Y2')
         params = extract_params(url)
-        assert_equal params[0], { :p1 => 'X1' }.to_query
-        assert_equal params[1], { :p2 => 'Y2' }.to_query
+        assert_equal({p1: 'X1'}.to_query, params[0])
+        assert_equal({p2: 'Y2'}.to_query, params[1])
       end
 
       def test_hash_parameter
         url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => {:name => 'Bob', :category => 'prof'})
         params = extract_params(url)
-        assert_equal params[0], { 'query[category]' => 'prof' }.to_query
-        assert_equal params[1], { 'query[name]'     => 'Bob'  }.to_query
+        assert_equal({'query[category]' => 'prof'}.to_query, params[0])
+        assert_equal({'query[name]' => 'Bob'}.to_query, params[1])
       end
 
       def test_array_parameter
         url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => ['Bob', 'prof'])
         params = extract_params(url)
-        assert_equal params[0], { 'query[]' => 'Bob'  }.to_query
-        assert_equal params[1], { 'query[]' => 'prof' }.to_query
+        assert_equal({'query[]' => 'Bob'}.to_query, params[0])
+        assert_equal({'query[]' => 'prof'}.to_query, params[1])
       end
 
       def test_hash_recursive_parameters
         url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => {:person => {:name => 'Bob', :position => 'prof'}, :hobby => 'piercing'})
         params = extract_params(url)
-        assert_equal params[0], { 'query[hobby]'            => 'piercing' }.to_query
-        assert_equal params[1], { 'query[person][name]'     => 'Bob'      }.to_query
-        assert_equal params[2], { 'query[person][position]' => 'prof'     }.to_query
+        assert_equal({'query[hobby]'            => 'piercing'}.to_query, params[0])
+        assert_equal({'query[person][name]'     => 'Bob'     }.to_query, params[1])
+        assert_equal({'query[person][position]' => 'prof'    }.to_query, params[2])
       end
 
       def test_hash_recursive_and_array_parameters
         url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :id => 101, :query => {:person => {:name => 'Bob', :position => ['prof', 'art director']}, :hobby => 'piercing'})
         assert_match(%r(^/c/a/101), url)
         params = extract_params(url)
-        assert_equal params[0], { 'query[hobby]'              => 'piercing'     }.to_query
-        assert_equal params[1], { 'query[person][name]'       => 'Bob'          }.to_query
-        assert_equal params[2], { 'query[person][position][]' => 'art director' }.to_query
-        assert_equal params[3], { 'query[person][position][]' => 'prof'         }.to_query
+        assert_equal({'query[hobby]'              => 'piercing'    }.to_query, params[0])
+        assert_equal({'query[person][name]'       => 'Bob'         }.to_query, params[1])
+        assert_equal({'query[person][position][]' => 'art director'}.to_query, params[2])
+        assert_equal({'query[person][position][]' => 'prof'        }.to_query, params[3])
       end
 
       def test_path_generation_for_symbol_parameter_keys