diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-09 23:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 23:53:54 +0200 |
| commit | 7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch) | |
| tree | 94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /actionpack/test/controller/routing_test.rb | |
| parent | 67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff) | |
| parent | f006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff) | |
| download | rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2 rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip | |
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 05293dd94c..9f0e3bff15 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -29,7 +29,8 @@ class UriReservedCharactersRoutingTest < ActiveSupport::TestCase def test_route_generation_escapes_unsafe_path_characters assert_equal "/content/act#{@escaped}ion/var#{@escaped}iable/add#{@escaped}itional-1/add#{@escaped}itional-2", - url_for(@set, controller: "content", + url_for(@set, + controller: "content", action: "act#{@segment}ion", variable: "var#{@segment}iable", additional: ["add#{@segment}itional-1", "add#{@segment}itional-2"]) @@ -45,7 +46,8 @@ class UriReservedCharactersRoutingTest < ActiveSupport::TestCase def test_route_generation_allows_passing_non_string_values_to_generated_helper assert_equal "/content/action/variable/1/2", - url_for(@set, controller: "content", + url_for(@set, + controller: "content", action: "action", variable: "variable", additional: [1, 2]) @@ -776,7 +778,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/journal", url_for(rs, controller: "content", + assert_equal "/journal", url_for(rs, + controller: "content", action: "list_journal", date: nil, user_id: nil) |