diff options
author | Vyacheslav Slinko <vyacheslav.slinko@gmail.com> | 2015-01-02 15:47:22 +0300 |
---|---|---|
committer | Vyacheslav Slinko <vyacheslav.slinko@gmail.com> | 2015-03-11 11:04:23 +0700 |
commit | 61ed518781cfc78bf1710286d84d4e74521f48d4 (patch) | |
tree | 28f51d37b5d1b5f5afba069aacf4bcb245986d28 /spec/mailers | |
parent | 21c99e6a7797edb6a857e90c83fee3e5f1051adc (diff) | |
download | gitlab-ce-61ed518781cfc78bf1710286d84d4e74521f48d4.tar.gz |
Make email display name configurable
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/notify_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 4090fa46205..b3c507ccbe2 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -5,6 +5,7 @@ describe Notify do include EmailSpec::Matchers include RepoHelpers + let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name } let(:gitlab_sender) { Gitlab.config.gitlab.email_from } let(:recipient) { create(:user, email: 'recipient@example.com') } let(:project) { create(:project) } @@ -23,7 +24,7 @@ describe Notify do shared_examples 'an email sent from GitLab' do it 'is sent from GitLab' do sender = subject.header[:from].addrs[0] - expect(sender.display_name).to eq('GitLab') + expect(sender.display_name).to eq(gitlab_sender_display_name) expect(sender.address).to eq(gitlab_sender) end end |