Permalink
Browse files

verify :redirect_to => :back should redirect to the referrer. [#280 s…

…tate:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
1 parent 322f3ea commit 1b4b8fbbd95d7d674df7f013fd88b9b7f859a6f1 @adkron adkron committed with lifo May 29, 2008
Showing with 35 additions and 18 deletions.
  1. +1 −1 actionpack/lib/action_controller/verification.rb
  2. +34 −17 actionpack/test/controller/verification_test.rb
View
2 actionpack/lib/action_controller/verification.rb
@@ -116,7 +116,7 @@ def verify_request_xhr_status(options) # :nodoc:
end
def apply_redirect_to(redirect_to_option) # :nodoc:
- redirect_to_option.is_a?(Symbol) ? self.send!(redirect_to_option) : redirect_to_option
+ (redirect_to_option.is_a?(Symbol) && redirect_to_option != :back) ? self.send!(redirect_to_option) : redirect_to_option
end
def apply_remaining_actions(options) # :nodoc:
View
51 actionpack/test/controller/verification_test.rb
@@ -21,10 +21,10 @@ class TestController < ActionController::Base
verify :only => :guarded_by_method, :method => :post,
:redirect_to => { :action => "unguarded" }
-
+
verify :only => :guarded_by_xhr, :xhr => true,
:redirect_to => { :action => "unguarded" }
-
+
verify :only => :guarded_by_not_xhr, :xhr => false,
:redirect_to => { :action => "unguarded" }
@@ -39,10 +39,13 @@ class TestController < ActionController::Base
verify :only => :no_default_action, :params => "santa"
+ verify :only => :guarded_with_back, :method => :post,
+ :redirect_to => :back
+
def guarded_one
render :text => "#{params[:one]}"
end
-
+
def guarded_one_for_named_route_test
render :text => "#{params[:one]}"
end
@@ -70,11 +73,11 @@ def multi_two
def guarded_by_method
render :text => "#{request.method}"
end
-
+
def guarded_by_xhr
render :text => "#{request.xhr?}"
end
-
+
def guarded_by_not_xhr
render :text => "#{request.xhr?}"
end
@@ -86,15 +89,19 @@ def unguarded
def two_redirects
render :nothing => true
end
-
+
def must_be_post
render :text => "Was a post!"
end
-
+
+ def guarded_with_back
+ render :text => "#{params[:one]}"
+ end
+
def no_default_action
# Will never run
end
-
+
protected
def rescue_action(e) raise end
@@ -109,7 +116,17 @@ def setup
@response = ActionController::TestResponse.new
ActionController::Routing::Routes.add_named_route :foo, '/foo', :controller => 'test', :action => 'foo'
end
-
+
+ def test_using_symbol_back_with_no_referrer
+ assert_raise(ActionController::RedirectBackError) { get :guarded_with_back }
+ end
+
+ def test_using_symbol_back_redirects_to_referrer
+ @request.env["HTTP_REFERER"] = "/foo"
+ get :guarded_with_back
+ assert_redirected_to '/foo'
+ end
+
def test_no_deprecation_warning_for_named_route
assert_not_deprecated do
get :guarded_one_for_named_route_test, :two => "not one"
@@ -209,44 +226,44 @@ def test_guarded_by_method_without_prereqs
get :guarded_by_method
assert_redirected_to :action => "unguarded"
end
-
+
def test_guarded_by_xhr_with_prereqs
xhr :post, :guarded_by_xhr
assert_equal "true", @response.body
end
-
+
def test_guarded_by_xhr_without_prereqs
get :guarded_by_xhr
assert_redirected_to :action => "unguarded"
end
-
+
def test_guarded_by_not_xhr_with_prereqs
get :guarded_by_not_xhr
assert_equal "false", @response.body
end
-
+
def test_guarded_by_not_xhr_without_prereqs
xhr :post, :guarded_by_not_xhr
assert_redirected_to :action => "unguarded"
end
-
+
def test_guarded_post_and_calls_render_succeeds
post :must_be_post
assert_equal "Was a post!", @response.body
end
-
+
def test_default_failure_should_be_a_bad_request
post :no_default_action
assert_response :bad_request
end
-
+
def test_guarded_post_and_calls_render_fails_and_sets_allow_header
get :must_be_post
assert_response 405
assert_equal "Must be post", @response.body
assert_equal "POST", @response.headers["Allow"]
end
-
+
def test_second_redirect
assert_nothing_raised { get :two_redirects }
end

0 comments on commit 1b4b8fb

Please sign in to comment.