aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorCristian Bica <cristian.bica@gmail.com>2014-08-13 22:55:32 +0300
committerCristian Bica <cristian.bica@gmail.com>2014-08-13 22:55:32 +0300
commit06908e60be2bd3e2f247e26d3d1fa6bcb7f43943 (patch)
tree2f1752c774fad931e62669ee96d26b5b7da0bd61 /actionpack/test
parent95b79c1ff4d253d1554615baa5a02b0910d5a6dc (diff)
parent2750cc41484266c731c4bf0460d74b0de49e7450 (diff)
downloadrails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.gz
rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.bz2
rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.zip
Merge branch 'master' into activejob
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/request_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 6737609567..fe9ee6f73d 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -640,7 +640,7 @@ end
class RequestMethod < BaseRequestTest
test "method returns environment's request method when it has not been
- overriden by middleware".squish do
+ overridden by middleware".squish do
ActionDispatch::Request::HTTP_METHODS.each do |method|
request = stub_request('REQUEST_METHOD' => method)