diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
commit | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (patch) | |
tree | e489b6e87557d3f6d8a94f2e7d4d47e633d646b5 /spec/workers | |
parent | 4e9acbfba3682c552b3de707c535e6257ef41054 (diff) | |
download | gitlab-ce-2c72daf2f1744f2b8c8c6674c266907e9ef55558.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb | 7 | ||||
-rw-r--r-- | spec/workers/pages_domain_ssl_renewal_worker_spec.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb b/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb index 736acc40371..1349a80029b 100644 --- a/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb +++ b/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb @@ -21,6 +21,10 @@ describe PagesDomainSslRenewalCronWorker do let!(:domain_without_auto_certificate) do create(:pages_domain, :without_certificate, :without_key, project: project, auto_ssl_enabled: true) end + let!(:domain_with_failed_auto_ssl) do + create(:pages_domain, :without_certificate, :without_key, project: project, + auto_ssl_enabled: true, auto_ssl_failed: true) + end let!(:domain_with_expired_auto_ssl) do create(:pages_domain, :letsencrypt, :with_expired_certificate, project: project) @@ -34,7 +38,8 @@ describe PagesDomainSslRenewalCronWorker do end [domain, - domain_with_obtained_letsencrypt].each do |domain| + domain_with_obtained_letsencrypt, + domain_with_failed_auto_ssl].each do |domain| expect(PagesDomainSslRenewalWorker).not_to receive(:perform_async).with(domain.id) end diff --git a/spec/workers/pages_domain_ssl_renewal_worker_spec.rb b/spec/workers/pages_domain_ssl_renewal_worker_spec.rb index 3552ff0823a..a35965f49b2 100644 --- a/spec/workers/pages_domain_ssl_renewal_worker_spec.rb +++ b/spec/workers/pages_domain_ssl_renewal_worker_spec.rb @@ -26,6 +26,8 @@ describe PagesDomainSslRenewalWorker do shared_examples 'does nothing' do it 'does nothing' do expect(::PagesDomains::ObtainLetsEncryptCertificateService).not_to receive(:new) + + worker.perform(domain.id) end end |