Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Do not use stored location for sign out.

  • Loading branch information...
commit 1e37e422392ed3100fd3dbbfe5e3f1fe58e1212d 1 parent ce1bd14
@josevalim josevalim authored
View
2  app/controllers/devise/sessions_controller.rb
@@ -25,7 +25,7 @@ def destroy
Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
set_flash_message :notice, :signed_out if signed_in
- # We actually need to hardcode this, as Rails default responder doesn't
+ # We actually need to hardcode this as Rails default responder doesn't
# support returning empty response on GET request
respond_to do |format|
format.any(*navigational_formats) { redirect_to redirect_path }
View
5 lib/devise/controllers/helpers.rb
@@ -207,10 +207,9 @@ def after_sign_in_path_for(resource_or_scope)
# scope. Notice that differently from +after_sign_in_path_for+ this method
# receives a symbol with the scope, and not the resource.
#
- # By default, it first tries to find a valid resource_return_to key in the
- # session, then it fallbacks to root_path.
+ # By default it is the root_path.
def after_sign_out_path_for(resource_or_scope)
- stored_location_for(resource_or_scope) || root_path
+ root_path
end
# Sign in a user and tries to redirect first to the stored location and
View
10 test/controllers/helpers_test.rb
@@ -248,16 +248,6 @@ def setup
end
end
- test 'sign out and redirect uses the stored location when signing out' do
- swap Devise, :sign_out_all_scopes => true do
- @mock_warden.expects(:user).times(Devise.mappings.size)
- @mock_warden.expects(:logout).with().returns(true)
- @controller.expects(:redirect_to).with("/foo.bar")
- @controller.session[:"admin_return_to"] = "/foo.bar"
- @controller.sign_out_and_redirect(:admin)
- end
- end
-
test 'is not a devise controller' do
assert_not @controller.devise_controller?
end
Please sign in to comment.
Something went wrong with that request. Please try again.