Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 5 deletions

diff --git a/spec/features/projects/pages_lets_encrypt_spec.rb b/spec/features/projects/pages_lets_encrypt_spec.rb
index 19c61487e16..d09014e915d 100644
--- a/spec/features/projects/pages_lets_encrypt_spec.rb
+++ b/spec/features/projects/pages_lets_encrypt_spec.rb
@@ -23,6 +23,18 @@ describe "Pages with Let's Encrypt", :https_pages_enabled do
     end
   end
 
+  it "creates new domain with Let's Encrypt enabled by default" do
+    visit new_project_pages_domain_path(project)
+
+    fill_in 'Domain', with: 'my.test.domain.com'
+
+    expect(find("#pages_domain_auto_ssl_enabled", visible: false).value).to eq 'true'
+    click_button 'Create New Domain'
+
+    expect(page).to have_content('my.test.domain.com')
+    expect(PagesDomain.find_by_domain('my.test.domain.com').auto_ssl_enabled).to eq(true)
+  end
+
   context 'when the auto SSL management is initially disabled' do
     let(:domain) do
       create(:pages_domain, auto_ssl_enabled: false, project: project)
@@ -96,7 +108,7 @@ describe "Pages with Let's Encrypt", :https_pages_enabled do
     end
 
     context 'when certificate is provided by user' do
-      let(:domain) { create(:pages_domain, project: project) }
+      let(:domain) { create(:pages_domain, project: project, auto_ssl_enabled: false) }
 
       it 'user sees certificate subject' do
         visit edit_project_pages_domain_path(project, domain)
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index eab0aefbe84..3c4b5b2c4ca 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -133,7 +133,7 @@ shared_examples 'pages settings editing' do
         end
       end
 
-      context 'when pages are exposed on external HTTPS address', :https_pages_enabled do
+      context 'when pages are exposed on external HTTPS address', :https_pages_enabled, :js do
         let(:certificate_pem) do
           <<~PEM
           -----BEGIN CERTIFICATE-----
@@ -178,6 +178,11 @@ shared_examples 'pages settings editing' do
           visit new_project_pages_domain_path(project)
 
           fill_in 'Domain', with: 'my.test.domain.com'
+
+          if ::Gitlab::LetsEncrypt.enabled?
+            find('.js-auto-ssl-toggle-container .project-feature-toggle').click
+          end
+
           fill_in 'Certificate (PEM)', with: certificate_pem
           fill_in 'Key (PEM)', with: certificate_key
           click_button 'Create New Domain'
@@ -202,7 +207,7 @@ shared_examples 'pages settings editing' do
 
         describe 'updating the certificate for an existing domain' do
           let!(:domain) do
-            create(:pages_domain, project: project)
+            create(:pages_domain, project: project, auto_ssl_enabled: false)
           end
 
           it 'allows the certificate to be updated' do
@@ -215,7 +220,7 @@ shared_examples 'pages settings editing' do
           end
 
           context 'when the certificate is invalid' do
-            let_it_be(:domain) do
+            let!(:domain) do
               create(:pages_domain, :without_certificate, :without_key, project: project)
             end
 
@@ -224,6 +229,10 @@ shared_examples 'pages settings editing' do
 
               within('#content-body') { click_link 'Edit' }
 
+              if ::Gitlab::LetsEncrypt.enabled?
+                find('.js-auto-ssl-toggle-container .project-feature-toggle').click
+              end
+
               fill_in 'Certificate (PEM)', with: 'invalid data'
               click_button 'Save Changes'
 
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 08a3511f70b..10c23cbb6d4 100644
--- a/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb
+++ b/spec/workers/pages_domain_ssl_renewal_cron_worker_spec.rb
@@ -13,7 +13,7 @@ describe PagesDomainSslRenewalCronWorker do
 
   describe '#perform' do
     let(:project) { create :project }
-    let!(:domain) { create(:pages_domain, project: project) }
+    let!(:domain) { create(:pages_domain, project: project, auto_ssl_enabled: false) }
     let!(:domain_with_enabled_auto_ssl) { create(:pages_domain, project: project, auto_ssl_enabled: true) }
     let!(:domain_with_obtained_letsencrypt) do
       create(:pages_domain, :letsencrypt, project: project, auto_ssl_enabled: true)