mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 23:28:31 +09:00
8c44b723bb
Clicking the confirmation link multiple times currently leads to entering account settings, which can be confusing. This commit changes that so that it redirects to the root path, so it behaves the same way as clicking only once in most cases.
100 lines
3.0 KiB
Ruby
100 lines
3.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Auth::ConfirmationsController, type: :controller do
|
|
render_views
|
|
|
|
describe 'GET #new' do
|
|
it 'returns http success' do
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
get :new
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
context 'when user is unconfirmed' do
|
|
let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) }
|
|
|
|
before do
|
|
allow(BootstrapTimelineWorker).to receive(:perform_async)
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
get :show, params: { confirmation_token: 'foobar' }
|
|
end
|
|
|
|
it 'redirects to login' do
|
|
expect(response).to redirect_to(new_user_session_path)
|
|
end
|
|
|
|
it 'queues up bootstrapping of home timeline' do
|
|
expect(BootstrapTimelineWorker).to have_received(:perform_async).with(user.account_id)
|
|
end
|
|
end
|
|
|
|
context 'when user is unconfirmed and unapproved' do
|
|
let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil, approved: false) }
|
|
|
|
before do
|
|
allow(BootstrapTimelineWorker).to receive(:perform_async)
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
get :show, params: { confirmation_token: 'foobar' }
|
|
end
|
|
|
|
it 'redirects to login' do
|
|
expect(response).to redirect_to(new_user_session_path)
|
|
end
|
|
end
|
|
|
|
context 'when user is already confirmed' do
|
|
let!(:user) { Fabricate(:user) }
|
|
|
|
before do
|
|
allow(BootstrapTimelineWorker).to receive(:perform_async)
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
sign_in(user, scope: :user)
|
|
get :show, params: { confirmation_token: 'foobar' }
|
|
end
|
|
|
|
it 'redirects to root path' do
|
|
expect(response).to redirect_to(root_path)
|
|
end
|
|
end
|
|
|
|
context 'when user is already confirmed but unapproved' do
|
|
let!(:user) { Fabricate(:user, approved: false) }
|
|
|
|
before do
|
|
allow(BootstrapTimelineWorker).to receive(:perform_async)
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
user.approved = false
|
|
user.save!
|
|
sign_in(user, scope: :user)
|
|
get :show, params: { confirmation_token: 'foobar' }
|
|
end
|
|
|
|
it 'redirects to settings' do
|
|
expect(response).to redirect_to(edit_user_registration_path)
|
|
end
|
|
end
|
|
|
|
context 'when user is updating email' do
|
|
let!(:user) { Fabricate(:user, confirmation_token: 'foobar', unconfirmed_email: 'new-email@example.com') }
|
|
|
|
before do
|
|
allow(BootstrapTimelineWorker).to receive(:perform_async)
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
get :show, params: { confirmation_token: 'foobar' }
|
|
end
|
|
|
|
it 'redirects to login' do
|
|
expect(response).to redirect_to(new_user_session_path)
|
|
end
|
|
|
|
it 'does not queue up bootstrapping of home timeline' do
|
|
expect(BootstrapTimelineWorker).to_not have_received(:perform_async)
|
|
end
|
|
end
|
|
end
|
|
end
|