diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-13 10:27:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-13 10:27:53 +0200 |
| commit | 8692b11e81ab2df2e4122c2f47d91e5eaaf508f2 (patch) | |
| tree | 695173d98666ddf3554ee380849a750d353d3314 /actionpack/lib/action_controller/testing | |
| parent | 4f9047ecc8f0e2c3d4491bae0051679569da71dc (diff) | |
| parent | f413a703ba5bcf4b369932ae805615c4a34d34cb (diff) | |
| download | rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.tar.gz rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.tar.bz2 rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/testing/test_case.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb index d32d5562e8..09b1a59254 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -52,7 +52,7 @@ module ActionController #:nodoc: class TestResponse < ActionDispatch::TestResponse def recycle! @status = 200 - @header = Rack::Utils::HeaderHash.new + @header = {} @writer = lambda { |x| @body << x } @block = nil @length = 0 diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/testing/test_case.rb index a11755b517..b66a4c15ff 100644 --- a/actionpack/lib/action_controller/testing/test_case.rb +++ b/actionpack/lib/action_controller/testing/test_case.rb @@ -179,7 +179,6 @@ module ActionController if @controller @controller.request = @request @controller.params = {} - @controller.send(:initialize_current_url) end end |