diff options
author | Vladimir Shushlin <vshushlin@gitlab.com> | 2019-04-09 17:46:29 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-04-09 17:46:29 +0000 |
commit | d69d29011cf9fe06e50a2c7d65b1ea88ea2d41d5 (patch) | |
tree | a794b2c4bfe9b00b552463928249b85957a5de05 /spec/mailers | |
parent | 61ab1f7364b1ea44984a67bb6ea0f5a2b7a353c8 (diff) | |
download | gitlab-ce-d69d29011cf9fe06e50a2c7d65b1ea88ea2d41d5.tar.gz |
Mark unverified pages domains for removal
Set pages_domain.remove_at when disabling it
Add specs for marking pages domain for removal
Notify user that domain is being removed
Add documentation
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/emails/pages_domains_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/mailers/emails/pages_domains_spec.rb b/spec/mailers/emails/pages_domains_spec.rb index c74fd66ad22..050af587061 100644 --- a/spec/mailers/emails/pages_domains_spec.rb +++ b/spec/mailers/emails/pages_domains_spec.rb @@ -26,6 +26,26 @@ describe Emails::PagesDomains do end end + shared_examples 'notification about upcoming domain removal' do + context 'when domain is not scheduled for removal' do + it 'asks user to remove it' do + is_expected.to have_body_text 'please remove it' + end + end + + context 'when domain is scheduled for removal' do + before do + domain.update!(remove_at: 1.week.from_now) + end + it 'notifies user that domain will be removed automatically' do + aggregate_failures do + is_expected.to have_body_text domain.remove_at.strftime('%F %T') + is_expected.to have_body_text "it will be removed from your GitLab project" + end + end + end + end + describe '#pages_domain_enabled_email' do let(:email_subject) { "#{project.path} | GitLab Pages domain '#{domain.domain}' has been enabled" } @@ -43,6 +63,8 @@ describe Emails::PagesDomains do it_behaves_like 'a pages domain email' + it_behaves_like 'notification about upcoming domain removal' + it { is_expected.to have_body_text 'has been disabled' } end @@ -63,6 +85,8 @@ describe Emails::PagesDomains do it_behaves_like 'a pages domain email' + it_behaves_like 'notification about upcoming domain removal' + it 'says verification has failed and when the domain is enabled until' do is_expected.to have_body_text 'Verification has failed' is_expected.to have_body_text domain.enabled_until.strftime('%F %T') |