Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 18 deletions

diff --git a/spec/services/serverless/associate_domain_service_spec.rb b/spec/services/serverless/associate_domain_service_spec.rb
index 3b5231989bc..2f45806589e 100644
--- a/spec/services/serverless/associate_domain_service_spec.rb
+++ b/spec/services/serverless/associate_domain_service_spec.rb
@@ -3,13 +3,24 @@
 require 'spec_helper'
 
 RSpec.describe Serverless::AssociateDomainService do
-  subject { described_class.new(knative, pages_domain_id: pages_domain_id, creator: creator) }
+  let_it_be(:sdc_pages_domain) { create(:pages_domain, :instance_serverless) }
+  let_it_be(:sdc_cluster) { create(:cluster, :with_installed_helm, :provided_by_gcp) }
+  let_it_be(:sdc_knative) { create(:clusters_applications_knative, cluster: sdc_cluster) }
+  let_it_be(:sdc_creator) { create(:user) }
+
+  let(:sdc) do
+    create(:serverless_domain_cluster,
+      knative: sdc_knative,
+      creator: sdc_creator,
+      pages_domain: sdc_pages_domain)
+  end
 
-  let(:sdc) { create(:serverless_domain_cluster, pages_domain: create(:pages_domain, :instance_serverless)) }
   let(:knative) { sdc.knative }
   let(:creator) { sdc.creator }
   let(:pages_domain_id) { sdc.pages_domain_id }
 
+  subject { described_class.new(knative, pages_domain_id: pages_domain_id, creator: creator) }
+
   context 'when the domain is unchanged' do
     let(:creator) { create(:user) }
 
@@ -19,8 +30,8 @@ RSpec.describe Serverless::AssociateDomainService do
   end
 
   context 'when domain is changed to nil' do
-    let(:pages_domain_id) { nil }
-    let(:creator) { create(:user) }
+    let_it_be(:creator) { create(:user) }
+    let_it_be(:pages_domain_id) { nil }
 
     it 'removes the association between knative and the domain' do
       expect { subject.execute }.to change { knative.reload.pages_domain }.from(sdc.pages_domain).to(nil)
@@ -32,11 +43,13 @@ RSpec.describe Serverless::AssociateDomainService do
   end
 
   context 'when a new domain is associated' do
-    let(:pages_domain_id) { create(:pages_domain, :instance_serverless).id }
-    let(:creator) { create(:user) }
+    let_it_be(:creator) { create(:user) }
+    let_it_be(:pages_domain_id) { create(:pages_domain, :instance_serverless).id }
 
     it 'creates an association with the domain' do
-      expect { subject.execute }.to change { knative.pages_domain.id }.from(sdc.pages_domain.id).to(pages_domain_id)
+      expect { subject.execute }.to change { knative.reload.pages_domain.id }
+        .from(sdc.pages_domain.id)
+        .to(pages_domain_id)
     end
 
     it 'updates creator' do
@@ -45,7 +58,7 @@ RSpec.describe Serverless::AssociateDomainService do
   end
 
   context 'when knative is not authorized to use the pages domain' do
-    let(:pages_domain_id) { create(:pages_domain).id }
+    let_it_be(:pages_domain_id) { create(:pages_domain).id }
 
     before do
       expect(knative).to receive(:available_domains).and_return(PagesDomain.none)
@@ -56,19 +69,23 @@ RSpec.describe Serverless::AssociateDomainService do
     end
   end
 
-  context 'when knative hostname is nil' do
-    let(:knative) { build(:clusters_applications_knative, hostname: nil) }
+  describe 'for new knative application' do
+    let_it_be(:cluster) { create(:cluster, :with_installed_helm, :provided_by_gcp) }
 
-    it 'sets hostname to a placeholder value' do
-      expect { subject.execute }.to change { knative.hostname }.to('example.com')
+    context 'when knative hostname is nil' do
+      let(:knative) { build(:clusters_applications_knative, cluster: cluster, hostname: nil) }
+
+      it 'sets hostname to a placeholder value' do
+        expect { subject.execute }.to change { knative.hostname }.to('example.com')
+      end
     end
-  end
 
-  context 'when knative hostname exists' do
-    let(:knative) { build(:clusters_applications_knative, hostname: 'hostname.com') }
+    context 'when knative hostname exists' do
+      let(:knative) { build(:clusters_applications_knative, cluster: cluster, hostname: 'hostname.com') }
 
-    it 'does not change hostname' do
-      expect { subject.execute }.not_to change { knative.hostname }
+      it 'does not change hostname' do
+        expect { subject.execute }.not_to change { knative.hostname }
+      end
     end
   end
 end
diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb
index 4b925a058e7..5736bf885be 100644
--- a/spec/services/web_hook_service_spec.rb
+++ b/spec/services/web_hook_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe WebHookService, :request_store, :clean_gitlab_redis_shared_state do
+RSpec.describe WebHookService, :request_store, :clean_gitlab_redis_shared_state, feature_category: :integrations do
   include StubRequests
 
   let(:ellipsis) { '…' }
@@ -358,6 +358,7 @@ RSpec.describe WebHookService, :request_store, :clean_gitlab_redis_shared_state
         {
           trigger: 'push_hooks',
           url: project_hook.url,
+          interpolated_url: project_hook.interpolated_url,
           request_headers: headers,
           request_data: data,
           response_body: 'Success',