diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
commit | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (patch) | |
tree | 574475bd0901a2f8906d36a4728b8bbb95b41e1c /spec/lib/gitlab/private_commit_email_spec.rb | |
parent | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/private_commit_email_spec.rb')
-rw-r--r-- | spec/lib/gitlab/private_commit_email_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/private_commit_email_spec.rb b/spec/lib/gitlab/private_commit_email_spec.rb index 10bf624bbdd..7b7a0f7c0ca 100644 --- a/spec/lib/gitlab/private_commit_email_spec.rb +++ b/spec/lib/gitlab/private_commit_email_spec.rb @@ -8,7 +8,7 @@ describe Gitlab::PrivateCommitEmail do let(:valid_email) { "#{id}-foo@#{hostname}" } let(:invalid_email) { "#{id}-foo@users.noreply.bar.com" } - context '.regex' do + describe '.regex' do subject { described_class.regex } it { is_expected.to match("1-foo@#{hostname}") } @@ -18,7 +18,7 @@ describe Gitlab::PrivateCommitEmail do it { is_expected.not_to match('foobar@gitlab.com') } end - context '.user_id_for_email' do + describe '.user_id_for_email' do it 'parses user id from email' do expect(described_class.user_id_for_email(valid_email)).to eq(id) end @@ -28,7 +28,7 @@ describe Gitlab::PrivateCommitEmail do end end - context '.user_ids_for_email' do + describe '.user_ids_for_email' do it 'returns deduplicated user IDs for each valid email' do result = described_class.user_ids_for_emails([valid_email, valid_email, invalid_email]) @@ -41,7 +41,7 @@ describe Gitlab::PrivateCommitEmail do end end - context '.for_user' do + describe '.for_user' do it 'returns email in the format id-username@hostname' do user = create(:user) |