aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-05-25 13:56:59 +0200
committerYves Senn <yves.senn@gmail.com>2014-05-25 13:56:59 +0200
commit2bb6b51c01719c3d558bf8cc962c812a5497f2b2 (patch)
tree75a59933f50d22d3f2b4de4da1696c1b39f3e727
parentf632f79b8dcd144408c66a544984b2ba9cf52f87 (diff)
parent839d461b61e92714f7b733416ea81ea34cadac55 (diff)
downloadrails-2bb6b51c01719c3d558bf8cc962c812a5497f2b2.tar.gz
rails-2bb6b51c01719c3d558bf8cc962c812a5497f2b2.tar.bz2
rails-2bb6b51c01719c3d558bf8cc962c812a5497f2b2.zip
Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_test
The correct status to test should be :switching_protocols.
-rw-r--r--actionpack/test/controller/new_base/bare_metal_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index 7396c850ad..2ddc07ef72 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -81,8 +81,8 @@ module BareMetalTest
assert_nil headers['Content-Length']
end
- test "head :continue (101) does not return a content-type header" do
- headers = HeadController.action(:continue).call(Rack::MockRequest.env_for("/")).second
+ test "head :switching_protocols (101) does not return a content-type header" do
+ headers = HeadController.action(:switching_protocols).call(Rack::MockRequest.env_for("/")).second
assert_nil headers['Content-Type']
assert_nil headers['Content-Length']
end