Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/spec/models/clusters/applications/knative_spec.rb b/spec/models/clusters/applications/knative_spec.rb
index 51c8a6bb68d..f1ce447a0d8 100644
--- a/spec/models/clusters/applications/knative_spec.rb
+++ b/spec/models/clusters/applications/knative_spec.rb
@@ -161,18 +161,19 @@ describe Clusters::Applications::Knative do
     end
 
     it "initializes command with all necessary postdelete script" do
-      api_resources = YAML.safe_load(File.read(Rails.root.join(Clusters::Applications::Knative::API_RESOURCES_PATH)))
+      api_groups = YAML.safe_load(File.read(Rails.root.join(Clusters::Applications::Knative::API_GROUPS_PATH)))
 
       remove_knative_istio_leftovers_script = [
         "kubectl delete --ignore-not-found ns knative-serving",
         "kubectl delete --ignore-not-found ns knative-build"
       ]
 
-      full_delete_commands_size = api_resources.size + remove_knative_istio_leftovers_script.size
+      full_delete_commands_size = api_groups.size + remove_knative_istio_leftovers_script.size
 
       expect(subject.postdelete).to include(*remove_knative_istio_leftovers_script)
       expect(subject.postdelete.size).to eq(full_delete_commands_size)
-      expect(subject.postdelete[2]).to eq("kubectl delete --ignore-not-found crd #{api_resources[0]}")
+      expect(subject.postdelete[2]).to eq("kubectl api-resources -o name --api-group #{api_groups[0]} | xargs kubectl delete --ignore-not-found crd")
+      expect(subject.postdelete[3]).to eq("kubectl api-resources -o name --api-group #{api_groups[1]} | xargs kubectl delete --ignore-not-found crd")
     end
   end