diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:06:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 01:06:32 +0300 |
commit | 15892d0271ce6e70fce3534ee12f649004ce148d (patch) | |
tree | 60af9ae90570e987d366db3b9102d9bea4985387 /spec | |
parent | f5897da89ca63facbef54c23cff894f2bbe8e644 (diff) |
Add latest changes from gitlab-org/security/gitlab@15-4-stable-ee
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/hook_data/group_member_builder_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/spec/lib/gitlab/hook_data/group_member_builder_spec.rb b/spec/lib/gitlab/hook_data/group_member_builder_spec.rb index 35ce31ab897..1551bdbaa9c 100644 --- a/spec/lib/gitlab/hook_data/group_member_builder_spec.rb +++ b/spec/lib/gitlab/hook_data/group_member_builder_spec.rb @@ -26,7 +26,7 @@ RSpec.describe Gitlab::HookData::GroupMemberBuilder do expect(data[:group_id]).to eq(group.id) expect(data[:user_username]).to eq(group_member.user.username) expect(data[:user_name]).to eq(group_member.user.name) - expect(data[:user_email]).to eq(group_member.user.email) + expect(data[:user_email]).to eq(group_member.user.webhook_email) expect(data[:user_id]).to eq(group_member.user.id) expect(data[:group_access]).to eq('Developer') expect(data[:created_at]).to eq(group_member.created_at&.xmlschema) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 04f2c7f9176..3cc34681ad6 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -6866,6 +6866,25 @@ RSpec.describe User do end end + describe '#webhook_email' do + let(:user) { build(:user, public_email: nil) } + + context 'when public email is present' do + before do + user.public_email = "hello@hello.com" + end + it 'returns public email' do + expect(user.webhook_email).to eq(user.public_email) + end + end + + context 'when public email is nil' do + it 'returns [REDACTED]' do + expect(user.webhook_email).to eq(_('[REDACTED]')) + end + end + end + describe 'user credit card validation' do context 'when user is initialized' do let(:user) { build(:user) } |