diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-17 11:40:12 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-17 11:40:12 +0000 |
commit | 2f145352713009b60c60161e09be5b5bed2d87f4 (patch) | |
tree | 7b5026f94053565040ea96a891c03ea269336dac | |
parent | f016da6207502c090f24fc5e79b6b89d9aa9b4b0 (diff) | |
parent | 46287f3638f2e285ccc46fc50bd9b7b0dc9d9bc3 (diff) | |
download | gitlab-ce-2f145352713009b60c60161e09be5b5bed2d87f4.tar.gz |
Merge branch 'fix-make-email-static' into 'master'
Make sure alias email would never match original user
See merge request !10037
-rw-r--r-- | spec/models/user_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 9da4140f3ce..90378179e32 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -699,7 +699,9 @@ describe User, models: true do let!(:user) { create(:user, name: 'John Doe', username: 'john.doe', email: 'john.doe@example.com' ) } let!(:another_user) { create(:user, name: 'Albert Smith', username: 'albert.smith', email: 'albert.smith@example.com' ) } - let!(:email) { create(:email, user: another_user) } + let!(:email) do + create(:email, user: another_user, email: 'alias@example.com') + end it 'returns users with a matching name' do expect(search_with_secondary_emails(user.name)).to eq([user]) |