mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-14 02:42:54 +00:00
5ec25ff3e1
A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.
52 lines
1.6 KiB
Ruby
52 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Auth::ConfirmationsController, type: :controller do
|
|
describe 'GET #new' do
|
|
it 'returns http success' do
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
get :new
|
|
expect(response).to have_http_status(:success)
|
|
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 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
|