aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-06-13 00:55:11 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-06-13 00:55:11 +0000
commitc0c001839c68c1dc9c17e2f33529fe9899188c48 (patch)
tree73b493bfbabfc1ed927d692ca79ae1b4398c80c9 /actionpack
parentc5f00580d376a226956401e8802ab7f0ffced563 (diff)
downloadrails-c0c001839c68c1dc9c17e2f33529fe9899188c48.tar.gz
rails-c0c001839c68c1dc9c17e2f33529fe9899188c48.tar.bz2
rails-c0c001839c68c1dc9c17e2f33529fe9899188c48.zip
Take advantage of Mocha support for sequenced returns. Closes #8639 [Josh Peek]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7010 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/integration_test.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 7ef7865df4..6212109c02 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -54,8 +54,7 @@ class SessionTest < Test::Unit::TestCase
@session.expects(:get).with(path,args)
- redirects = [true, true, false]
- @session.stubs(:redirect?).returns(lambda { redirects.shift })
+ @session.stubs(:redirect?).returns(true, true, false)
@session.expects(:follow_redirect!).times(2)
@session.stubs(:status).returns(200)
@@ -67,8 +66,7 @@ class SessionTest < Test::Unit::TestCase
@session.expects(:post).with(path,args)
- redirects = [true, true, false]
- @session.stubs(:redirect?).returns(lambda { redirects.shift })
+ @session.stubs(:redirect?).returns(true, true, false)
@session.expects(:follow_redirect!).times(2)
@session.stubs(:status).returns(200)