diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 12:10:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 12:10:02 +0300 |
commit | 51c20446a0dcf2f5f4a0254230876bd472a254e7 (patch) | |
tree | 5fc1658c6a240e49d9bc76113f33c500b45500bc /spec/models | |
parent | 0c4b9cacd575b3e71e41a13f042062b3adcb4caf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/email_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb index aa3a60b867a..dabf2bb80b5 100644 --- a/spec/models/email_spec.rb +++ b/spec/models/email_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe Email do describe 'validations' do - it_behaves_like 'an object with email-formated attributes', :email do + it_behaves_like 'an object with RFC3696 compliant email-formated attributes', :email do subject { build(:email) } end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7649b09aa8e..83f274f1894 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -296,7 +296,7 @@ describe User, :do_not_mock_admin_mode do subject { build(:user) } end - it_behaves_like 'an object with email-formated attributes', :public_email, :notification_email do + it_behaves_like 'an object with RFC3696 compliant email-formated attributes', :public_email, :notification_email do subject { build(:user).tap { |user| user.emails << build(:email, email: email_value) } } end @@ -916,7 +916,6 @@ describe User, :do_not_mock_admin_mode do user.tap { |u| u.update!(email: new_email) }.reload end.to change(user, :unconfirmed_email).to(new_email) end - it 'does not change :notification_email' do expect do user.tap { |u| u.update!(email: new_email) }.reload |