mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 00:15:05 +00:00
964ae8eee5
Allow access to account settings, 2FA, authorized applications, and account deletions to unconfirmed and pending users, as well as users who had their accounts disabled. Suspended users cannot update their e-mail or password or delete their account. Display account status on account settings page, for example, when an account is frozen, limited, unconfirmed or pending review. After sign up, login users straight away and show a simple page that tells them the status of their account with links to account settings and logout, to reduce onboarding friction and allow users to correct wrongly typed e-mail addresses. Move the final sign-up step of SSO integrations to be the same as above to reduce code duplication.
104 lines
2.5 KiB
Ruby
104 lines
2.5 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe Settings::DeletesController do
|
|
render_views
|
|
|
|
describe 'GET #show' do
|
|
context 'when signed in' do
|
|
let(:user) { Fabricate(:user) }
|
|
|
|
before do
|
|
sign_in user, scope: :user
|
|
end
|
|
|
|
it 'renders confirmation page' do
|
|
get :show
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
context 'when suspended' do
|
|
let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
|
|
|
|
it 'returns http forbidden' do
|
|
get :show
|
|
expect(response).to have_http_status(403)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when not signed in' do
|
|
it 'redirects' do
|
|
get :show
|
|
expect(response).to redirect_to '/auth/sign_in'
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'DELETE #destroy' do
|
|
context 'when signed in' do
|
|
let(:user) { Fabricate(:user, password: 'petsmoldoggos') }
|
|
|
|
before do
|
|
sign_in user, scope: :user
|
|
end
|
|
|
|
context 'with correct password' do
|
|
before do
|
|
delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } }
|
|
end
|
|
|
|
it 'redirects to sign in page' do
|
|
expect(response).to redirect_to '/auth/sign_in'
|
|
end
|
|
|
|
it 'removes user record' do
|
|
expect(User.find_by(id: user.id)).to be_nil
|
|
end
|
|
|
|
it 'marks account as suspended' do
|
|
expect(user.account.reload).to be_suspended
|
|
end
|
|
|
|
context 'when suspended' do
|
|
let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
|
|
|
|
it 'returns http forbidden' do
|
|
expect(response).to have_http_status(403)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with incorrect password' do
|
|
before do
|
|
delete :destroy, params: { form_delete_confirmation: { password: 'blaze420' } }
|
|
end
|
|
|
|
it 'redirects back to confirmation page' do
|
|
expect(response).to redirect_to settings_delete_path
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when not signed in' do
|
|
it 'redirects' do
|
|
delete :destroy
|
|
expect(response).to redirect_to '/auth/sign_in'
|
|
end
|
|
end
|
|
|
|
context do
|
|
around do |example|
|
|
open_deletion = Setting.open_deletion
|
|
example.run
|
|
Setting.open_deletion = open_deletion
|
|
end
|
|
|
|
it 'redirects' do
|
|
Setting.open_deletion = false
|
|
delete :destroy
|
|
expect(response).to redirect_to root_path
|
|
end
|
|
end
|
|
end
|
|
end
|