diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-27 21:00:54 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-27 21:00:54 +0200 |
| commit | fe0251e408a8b5d1ee149c7cad7bcfc495ce1595 (patch) | |
| tree | 620f92c8485809ded3cd4081966d147efc8ad806 /actionpack/test/controller/url_for_test.rb | |
| parent | 6067d1620075c1c311bbae01993453cd80967804 (diff) | |
| parent | 50decfbc0e2e58961cc3665710922860d38ee2fb (diff) | |
| download | rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.gz rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.tar.bz2 rails-fe0251e408a8b5d1ee149c7cad7bcfc495ce1595.zip | |
Merge remote branch 'miloops/warnings'
Conflicts:
actionpack/lib/action_controller/metal/url_for.rb
Diffstat (limited to 'actionpack/test/controller/url_for_test.rb')
| -rw-r--r-- | actionpack/test/controller/url_for_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb index 2d0c019128..4c07ca4cc3 100644 --- a/actionpack/test/controller/url_for_test.rb +++ b/actionpack/test/controller/url_for_test.rb @@ -219,7 +219,7 @@ module AbstractController 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 + 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 |