Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 9 deletions

diff --git a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
index caa84faa9c1..74fa2be5930 100644
--- a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
+++ b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
@@ -38,28 +38,44 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
               .and_return(double(execute: kubernetes_namespace))
           end
 
-          context 'and the knative version role binding is missing' do
+          context 'and the knative-serving namespace is missing' do
             before do
-              allow(Clusters::KnativeVersionRoleBindingFinder).to receive(:new)
-                .and_return(double(execute: nil))
+              allow(Clusters::KnativeServingNamespaceFinder).to receive(:new)
+                .and_return(double(execute: false))
             end
 
             it { is_expected.to be_truthy }
           end
 
-          context 'and the knative version role binding already exists' do
+          context 'and the knative-serving namespace exists' do
             before do
-              allow(Clusters::KnativeVersionRoleBindingFinder).to receive(:new)
+              allow(Clusters::KnativeServingNamespaceFinder).to receive(:new)
                 .and_return(double(execute: true))
             end
 
-            it { is_expected.to be_falsey }
-
-            context 'and the service_account_token is blank' do
-              let(:kubernetes_namespace) { instance_double(Clusters::KubernetesNamespace, service_account_token: nil) }
+            context 'and the knative version role binding is missing' do
+              before do
+                allow(Clusters::KnativeVersionRoleBindingFinder).to receive(:new)
+                  .and_return(double(execute: nil))
+              end
 
               it { is_expected.to be_truthy }
             end
+
+            context 'and the knative version role binding already exists' do
+              before do
+                allow(Clusters::KnativeVersionRoleBindingFinder).to receive(:new)
+                  .and_return(double(execute: true))
+              end
+
+              it { is_expected.to be_falsey }
+
+              context 'and the service_account_token is blank' do
+                let(:kubernetes_namespace) { instance_double(Clusters::KubernetesNamespace, service_account_token: nil) }
+
+                it { is_expected.to be_truthy }
+              end
+            end
           end
         end
       end