Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/users/email_confirmations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def process_successful_confirmation(email_address)
confirm_and_notify(email_address)
if current_user
flash[:success] = t('devise.confirmations.confirmed')
if params[:request_id]
if params[:request_id] && IdentityConfig.store.feature_select_email_to_share_enabled
redirect_to sign_up_select_email_url
else
redirect_to account_url
Expand Down
23 changes: 23 additions & 0 deletions spec/controllers/users/email_confirmations_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,29 @@
)
expect(response).to redirect_to(sign_up_select_email_url)
end

context 'when select email feature is disabled' do
before do
allow(IdentityConfig.store).to receive(:feature_select_email_to_share_enabled)
.and_return(false)
end

it 'redirects to account page with success message' do
new_email = Faker::Internet.email
add_email_form = AddUserEmailForm.new
add_email_form.submit(user, email: new_email, request_id: sp_request_uuid)
email_record = add_email_form.email_address_record(new_email)

get :create, params: {
confirmation_token: email_record.reload.confirmation_token,
request_id: sp_request_uuid,
from_select_email_flow: 'true',
}

expect(response).to redirect_to(account_path)
expect(flash[:success]).to eq(t('devise.confirmations.confirmed'))
end
end
end
end
end
Expand Down