Commit 7e37b6ef authored by Małgorzata Ksionek's avatar Małgorzata Ksionek

Add cr remarks

parent b9469a3a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
module EE module EE
module Emails module Emails
module Members module Members
def member_access_granted_email_with_confirmation(member_id) def provisioned_member_access_granted_email(member_id)
@member_id = member_id @member_id = member_id
return unless member_exists? return unless member_exists?
......
...@@ -52,7 +52,7 @@ module EE ...@@ -52,7 +52,7 @@ module EE
end end
def new_group_member_with_confirmation_email def new_group_member_with_confirmation_email
::Notify.member_access_granted_email_with_confirmation(member.id).message ::Notify.provisioned_member_access_granted_email(member.id).message
end end
end end
......
...@@ -63,7 +63,7 @@ module EE ...@@ -63,7 +63,7 @@ module EE
end end
def new_group_member_with_confirmation(group_member) def new_group_member_with_confirmation(group_member)
mailer.member_access_granted_email_with_confirmation(group_member.id).deliver_later mailer.provisioned_member_access_granted_email(group_member.id).deliver_later
end end
private private
......
...@@ -375,7 +375,7 @@ RSpec.describe Notify do ...@@ -375,7 +375,7 @@ RSpec.describe Notify do
let(:group) { group_member.source } let(:group) { group_member.source }
let(:recipient) { group_member.user } let(:recipient) { group_member.user }
subject { described_class.member_access_granted_email_with_confirmation(group_member.id) } subject { described_class.provisioned_member_access_granted_email(group_member.id) }
it_behaves_like 'an email sent from GitLab' it_behaves_like 'an email sent from GitLab'
it_behaves_like 'it should not have Gmail Actions links' it_behaves_like 'it should not have Gmail Actions links'
...@@ -388,12 +388,12 @@ RSpec.describe Notify do ...@@ -388,12 +388,12 @@ RSpec.describe Notify do
end end
it 'contains all the useful information' do it 'contains all the useful information' do
is_expected.to have_subject "Welcome to GitLab" is_expected.to have_subject 'Welcome to GitLab'
is_expected.to have_body_text group.name is_expected.to have_body_text group.name
is_expected.to have_body_text group.web_url is_expected.to have_body_text group.web_url
is_expected.to have_body_text recipient.username is_expected.to have_body_text recipient.username
is_expected.to have_body_text recipient.email is_expected.to have_body_text recipient.email
is_expected.to have_body_text 'Confirm your account' is_expected.to have_body_text 'To get started, click the link below to confirm your account'
is_expected.to have_body_text recipient.confirmation_token is_expected.to have_body_text recipient.confirmation_token
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment