Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 11 deletions

diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index e5caa11452e..2be59e5f515 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -5,6 +5,11 @@ require 'spec_helper'
 RSpec.describe Clusters::Applications::Ingress do
   let(:ingress) { create(:clusters_applications_ingress) }
 
+  before do
+    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
+    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async)
+  end
+
   it_behaves_like 'having unique enum values'
 
   include_examples 'cluster application core specs', :clusters_applications_ingress
@@ -13,11 +18,6 @@ RSpec.describe Clusters::Applications::Ingress do
   include_examples 'cluster application helm specs', :clusters_applications_ingress
   include_examples 'cluster application initial status specs'
 
-  before do
-    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
-    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async)
-  end
-
   describe 'default values' do
     it { expect(subject.ingress_type).to eq("nginx") }
     it { expect(subject.version).to eq(described_class::VERSION) }
diff --git a/spec/models/clusters/applications/knative_spec.rb b/spec/models/clusters/applications/knative_spec.rb
index 3914450339a..f6b13f4a93f 100644
--- a/spec/models/clusters/applications/knative_spec.rb
+++ b/spec/models/clusters/applications/knative_spec.rb
@@ -5,18 +5,18 @@ require 'spec_helper'
 RSpec.describe Clusters::Applications::Knative do
   let(:knative) { create(:clusters_applications_knative) }
 
-  include_examples 'cluster application core specs', :clusters_applications_knative
-  include_examples 'cluster application status specs', :clusters_applications_knative
-  include_examples 'cluster application helm specs', :clusters_applications_knative
-  include_examples 'cluster application version specs', :clusters_applications_knative
-  include_examples 'cluster application initial status specs'
-
   before do
     allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
     allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async)
     allow(ClusterConfigureIstioWorker).to receive(:perform_async)
   end
 
+  include_examples 'cluster application core specs', :clusters_applications_knative
+  include_examples 'cluster application status specs', :clusters_applications_knative
+  include_examples 'cluster application helm specs', :clusters_applications_knative
+  include_examples 'cluster application version specs', :clusters_applications_knative
+  include_examples 'cluster application initial status specs'
+
   describe 'associations' do
     it { is_expected.to have_one(:serverless_domain_cluster).class_name('::Serverless::DomainCluster').with_foreign_key('clusters_applications_knative_id').inverse_of(:knative) }
   end