aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorChristos Zisopoulos <christos@42linesofcode.com>2008-12-10 18:38:28 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-10 18:38:28 -0600
commit69387ce0169b95d3a170cfb1c66a7570b1746e37 (patch)
tree3f607c98710f079c851ee10d75219c1dd7a90be2 /actionpack/test
parent75fa82418d54b36b6092767f2a2b5c1d5324441b (diff)
downloadrails-69387ce0169b95d3a170cfb1c66a7570b1746e37.tar.gz
rails-69387ce0169b95d3a170cfb1c66a7570b1746e37.tar.bz2
rails-69387ce0169b95d3a170cfb1c66a7570b1746e37.zip
Fix for Integration::Session follow_redirect! headers['location'] bug with Rack [#1555 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/integration_test.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 4735b2927b..6a793c8bb6 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -30,14 +30,6 @@ class SessionTest < Test::Unit::TestCase
assert_raise(RuntimeError) { @session.follow_redirect! }
end
- def test_follow_redirect_calls_get_and_returns_status
- @session.stubs(:redirect?).returns(true)
- @session.stubs(:headers).returns({"location" => ["www.google.com"]})
- @session.stubs(:status).returns(200)
- @session.expects(:get)
- assert_equal 200, @session.follow_redirect!
- end
-
def test_request_via_redirect_uses_given_method
path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue"}
@session.expects(:put).with(path, args, headers)
@@ -323,6 +315,10 @@ class IntegrationProcessTest < ActionController::IntegrationTest
assert_equal "<html><body>You are being <a href=\"http://www.example.com/get\">redirected</a>.</body></html>", response.body
assert_kind_of HTML::Document, html_document
assert_equal 1, request_count
+
+ follow_redirect!
+ assert_response :success
+ assert_equal "/get", path
end
end