aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-06-14 13:23:55 +0000
committerJamis Buck <jamis@37signals.com>2005-06-14 13:23:55 +0000
commit75fb0a32a817317ea6ccccfb3ee6b7cd99824ce9 (patch)
tree2f696783e8a8094d6f6e4d226d5f567c46cf58ed /actionpack/test
parentb2b757be393fa33da8916249c9d77b2bce56bcaf (diff)
downloadrails-75fb0a32a817317ea6ccccfb3ee6b7cd99824ce9.tar.gz
rails-75fb0a32a817317ea6ccccfb3ee6b7cd99824ce9.tar.bz2
rails-75fb0a32a817317ea6ccccfb3ee6b7cd99824ce9.zip
Support :render option to :verify #1440 [TobiasLuetke]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/verification_test.rb18
1 files changed, 17 insertions, 1 deletions
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb
index e78ad7f610..d5741526ef 100644
--- a/actionpack/test/controller/verification_test.rb
+++ b/actionpack/test/controller/verification_test.rb
@@ -25,6 +25,8 @@ class VerificationTest < Test::Unit::TestCase
verify :only => :two_redirects, :method => :post,
:redirect_to => { :action => "unguarded" }
+ verify :only => :must_be_post, :method => :post, :render => { :status => 500, :text => "Must be post"}
+
def guarded_one
render :text => "#{@params["one"]}"
end
@@ -60,7 +62,11 @@ class VerificationTest < Test::Unit::TestCase
def two_redirects
render :nothing => true
end
-
+
+ def must_be_post
+ render :text => "Was a post!"
+ end
+
protected
def rescue_action(e) raise end
@@ -166,6 +172,16 @@ class VerificationTest < Test::Unit::TestCase
get :guarded_by_method
assert_redirected_to :action => "unguarded"
end
+
+ def test_guarded_post_and_calls_render
+ post :must_be_post
+ assert_equal "Was a post!", @response.body
+
+ get :must_be_post
+ assert_response 500
+ assert_equal "Must be post", @response.body
+ end
+
def test_second_redirect
assert_nothing_raised { get :two_redirects }