diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-10-15 17:16:42 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-10-15 17:16:42 -0700 |
| commit | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (patch) | |
| tree | c69eff105f58549115175269acd06032c9f96c70 | |
| parent | c44d560145cc332d48b9fbacbc7d23954ebb4a46 (diff) | |
| download | rails-ef70ad5538c4ce02c4d31ef01a8db6b55c837571.tar.gz rails-ef70ad5538c4ce02c4d31ef01a8db6b55c837571.tar.bz2 rails-ef70ad5538c4ce02c4d31ef01a8db6b55c837571.zip | |
Fix a few more 1.9 bugs. Rack 1.0.1 is required for 1.9 compliance but not release, so bundling 1.0.1 from git
| -rw-r--r-- | actionpack/Gemfile | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/test_request_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/Gemfile b/actionpack/Gemfile index 3cf6e6e333..506458365f 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -2,7 +2,7 @@ rails_root = Pathname.new(File.dirname(__FILE__)).join("..") Gem.sources.each { |uri| source uri } -gem "rack", "~> 1.0.0" +gem "rack", "1.0.1", :git => "git://github.com/rack/rack.git", :branch => "rack-1.0" gem "rack-test", "~> 0.5.0" gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport") gem "activemodel", "3.0.pre", :vendored_at => rails_root.join("activemodel") diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb index b8e340e055..b2006a0d2f 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 [0, 1], env.delete("rack.version") + assert_equal [1, 0], 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") |