diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-10-30 08:53:24 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-30 18:16:09 +0800 |
commit | 8362a875728cd784a11d70460f82c14a2d3eca99 (patch) | |
tree | 60a56da674e94389b18d1465f9bb099644a045e5 /spec | |
parent | 39ec9bd4e635c3f6bc00a2dadd0359619a64236f (diff) | |
download | gitlab-ce-8362a875728cd784a11d70460f82c14a2d3eca99.tar.gz |
Merge branch '39366-email-confirmation-fails' into 'master'
grab the correct username when confirming secondary email
Closes #39366
See merge request gitlab-org/gitlab-ce!15010
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/email_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb index b32dd31ae6d..47eb0717c0c 100644 --- a/spec/models/email_spec.rb +++ b/spec/models/email_spec.rb @@ -40,4 +40,12 @@ describe Email do expect(user.emails.confirmed.count).to eq 1 end end + + describe 'delegation' do + let(:user) { create(:user) } + + it 'delegates to :user' do + expect(build(:email, user: user).username).to eq user.username + end + end end |