diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 01:26:19 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 01:26:19 -0800 |
| commit | 111f2f442214d0212a76484d29bf6dab1aca0507 (patch) | |
| tree | b8ea39d617db21a7f1deb9f7abcff516945dff47 /actionpack | |
| parent | 5923ee6fe04500ce46f7fc8fff6aafcfd64e68db (diff) | |
| download | rails-111f2f442214d0212a76484d29bf6dab1aca0507.tar.gz rails-111f2f442214d0212a76484d29bf6dab1aca0507.tar.bz2 rails-111f2f442214d0212a76484d29bf6dab1aca0507.zip | |
Use released rack
`rack.version` was bumped in https://github.com/rack/rack/commit/28e77c710ac2ddb35c436d78d72e28f28f964446
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/test_request_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 0f5880c1a7..c0040ec28e 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency 'activesupport', version - s.add_dependency 'rack', '~> 1.6.0.beta2' + s.add_dependency 'rack', '~> 1.6.0' s.add_dependency 'rack-test', '~> 0.6.2' s.add_dependency 'rails-html-sanitizer', '~> 1.0', '>= 1.0.1' s.add_dependency 'rails-dom-testing', '~> 1.0', '>= 1.0.5' diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb index 65ad8677f3..cc35d4594e 100644 --- a/actionpack/test/dispatch/test_request_test.rb +++ b/actionpack/test/dispatch/test_request_test.rb @@ -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, 2], env.delete("rack.version") + assert_equal [1, 3], 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") |