diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
| commit | 016b1d3596ce12367edac8bb442f5c630a453ecf (patch) | |
| tree | 49435918ebb372f617c3cc95bc495f6dd5c12d24 /actionpack/test/dispatch/test_request_test.rb | |
| parent | 22d5e3d89d619acb9179dfcdd33f1afaee9567ca (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.gz rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.bz2 rails-016b1d3596ce12367edac8bb442f5c630a453ecf.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/dispatch/test_request_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/test_request_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb index 5da02b2ea6..b8e340e055 100644 --- a/actionpack/test/dispatch/test_request_test.rb +++ b/actionpack/test/dispatch/test_request_test.rb @@ -5,7 +5,7 @@ class TestRequestTest < ActiveSupport::TestCase env = ActionDispatch::TestRequest.new.env assert_equal "GET", env.delete("REQUEST_METHOD") - assert_equal "off", env.delete("HTTPS") + assert_equal nil, env.delete("HTTPS") assert_equal "http", env.delete("rack.url_scheme") assert_equal "example.org", env.delete("SERVER_NAME") assert_equal "80", env.delete("SERVER_PORT") @@ -18,7 +18,7 @@ class TestRequestTest < ActiveSupport::TestCase assert_equal "0.0.0.0", env.delete("REMOTE_ADDR") assert_equal "Rails Testing", env.delete("HTTP_USER_AGENT") - assert_equal [1, 0], env.delete("rack.version") + assert_equal [0, 1], env.delete("rack.version") assert_equal "", env.delete("rack.input").string assert_kind_of StringIO, env.delete("rack.errors") assert_equal true, env.delete("rack.multithread") |