Skip to content

Commit

Permalink
Auth sign out (mastodon#2511)
Browse files Browse the repository at this point in the history
* Add a spec for signing out

* Add spec showing that suspended user gets a 403 forbidden on sign out

* Allow suspended account users to sign out
  • Loading branch information
mjankowski authored and Gargron committed May 2, 2017
1 parent bea97ea commit 268dd32
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/auth/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class Auth::SessionsController < Devise::SessionsController
layout 'auth'

skip_before_action :require_no_authentication, only: [:create]
skip_before_action :check_suspension, only: [:destroy]
prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]

def create
Expand Down
27 changes: 27 additions & 0 deletions spec/controllers/auth/sessions_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,33 @@
end
end

describe 'DELETE #destroy' do
let(:user) { Fabricate(:user) }

before do
request.env['devise.mapping'] = Devise.mappings[:user]
end

context 'with a regular user' do
it 'redirects to home after sign out' do
sign_in(user, scope: :user)
delete :destroy

expect(response).to redirect_to(root_path)
end
end

context 'with a suspended user' do
it 'redirects to home after sign out' do
Fabricate(:account, user: user, suspended: true)
sign_in(user, scope: :user)
delete :destroy

expect(response).to redirect_to(root_path)
end
end
end

describe 'POST #create' do
before do
request.env['devise.mapping'] = Devise.mappings[:user]
Expand Down

0 comments on commit 268dd32

Please sign in to comment.