diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-05-15 19:40:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 19:40:46 -0500 |
| commit | 661f537b15026a35234db8a7b9386b4335198a8a (patch) | |
| tree | d1e98250f7d9c95f7741e4011ef06b8912841208 | |
| parent | d7a0d288fca496dcdad2261469c4e87af2354844 (diff) | |
| parent | e605921614c286ab2d6b4cafb655230a3d9b5fee (diff) | |
| download | rails-661f537b15026a35234db8a7b9386b4335198a8a.tar.gz rails-661f537b15026a35234db8a7b9386b4335198a8a.tar.bz2 rails-661f537b15026a35234db8a7b9386b4335198a8a.zip | |
Merge pull request #29095 from y-yagi/fix_test_with_rack_203
Fix `TestInvalidUrls` with rack 2.0.3
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ad0ec7be0c..26a7fa8b0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM simple_uuid que (0.12.0) racc (1.4.14) - rack (2.0.1) + rack (2.0.3) rack-cache (1.6.1) rack (>= 0.4) rack-protection (1.5.3) diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index d64917e0d3..32cd78e492 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -4419,7 +4419,7 @@ class TestInvalidUrls < ActionDispatch::IntegrationTest end end - test "invalid UTF-8 encoding returns a 400 Bad Request" do + test "invalid UTF-8 encoding is treated as ASCII 8BIT encode" do with_routing do |set| set.draw do get "/bar/:id", to: redirect("/foo/show/%{id}") @@ -4435,19 +4435,19 @@ class TestInvalidUrls < ActionDispatch::IntegrationTest end get "/%E2%EF%BF%BD%A6" - assert_response :bad_request + assert_response :not_found get "/foo/%E2%EF%BF%BD%A6" - assert_response :bad_request + assert_response :not_found get "/foo/show/%E2%EF%BF%BD%A6" - assert_response :bad_request + assert_response :ok get "/bar/%E2%EF%BF%BD%A6" - assert_response :bad_request + assert_response :redirect get "/foobar/%E2%EF%BF%BD%A6" - assert_response :bad_request + assert_response :ok end end end |