Skip to content
Snippets Groups Projects
Commit 78c8a3e3 authored by Douwe Maan's avatar Douwe Maan Committed by Stan Hu
Browse files

Fix bug causing not all emails to show up in commit email selectbox

parent 5b1b0934
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -7,7 +7,7 @@ module ProfilesHelper
 
[
[s_("Profiles|Use a private email - %{email}").html_safe % { email: private_email }, Gitlab::PrivateCommitEmail::TOKEN],
verified_emails
*verified_emails
]
end
 
Loading
Loading
---
title: Fix bug causing not all emails to show up in commit email selectbox
merge_request:
author:
type: fixed
Loading
Loading
@@ -4,12 +4,17 @@ describe ProfilesHelper do
describe '#commit_email_select_options' do
it 'returns an array with private commit email along with all the verified emails' do
user = create(:user)
create(:email, user: user)
confirmed_email1 = create(:email, :confirmed, user: user)
confirmed_email2 = create(:email, :confirmed, user: user)
private_email = user.private_commit_email
 
verified_emails = user.verified_emails - [private_email]
emails = [
["Use a private email - #{private_email}", Gitlab::PrivateCommitEmail::TOKEN],
verified_emails
user.email,
confirmed_email1.email,
confirmed_email2.email
]
 
expect(helper.commit_email_select_options(user)).to match_array(emails)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment