Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 63 deletions

diff --git a/spec/requests/api/graphql/ci/catalog/resource_spec.rb b/spec/requests/api/graphql/ci/catalog/resource_spec.rb
index 87d09d05f44..9fe73e7ba45 100644
--- a/spec/requests/api/graphql/ci/catalog/resource_spec.rb
+++ b/spec/requests/api/graphql/ci/catalog/resource_spec.rb
@@ -294,34 +294,6 @@ RSpec.describe 'Query.ciCatalogResource', feature_category: :pipeline_compositio
     end
   end
 
-  describe 'rootNamespace' do
-    let(:query) do
-      <<~GQL
-        query {
-          ciCatalogResource(id: "#{resource.to_global_id}") {
-            id
-            rootNamespace {
-              id
-              name
-              path
-            }
-          }
-        }
-      GQL
-    end
-
-    it 'returns the correct root namespace data' do
-      post_query
-
-      expect(graphql_data_at(:ciCatalogResource)).to match(
-        a_graphql_entity_for(
-          resource,
-          rootNamespace: a_graphql_entity_for(namespace, :name, :path)
-        )
-      )
-    end
-  end
-
   describe 'openIssuesCount' do
     context 'when open_issue_count is requested' do
       let(:query) do
diff --git a/spec/requests/api/graphql/ci/catalog/resources_spec.rb b/spec/requests/api/graphql/ci/catalog/resources_spec.rb
index 783144e5e40..23d91f6dd76 100644
--- a/spec/requests/api/graphql/ci/catalog/resources_spec.rb
+++ b/spec/requests/api/graphql/ci/catalog/resources_spec.rb
@@ -205,41 +205,6 @@ RSpec.describe 'Query.ciCatalogResources', feature_category: :pipeline_compositi
     it_behaves_like 'avoids N+1 queries'
   end
 
-  describe 'rootNamespace' do
-    before_all do
-      namespace.add_developer(user)
-    end
-
-    let(:query) do
-      <<~GQL
-        query {
-          ciCatalogResources {
-            nodes {
-              id
-              rootNamespace {
-                id
-                name
-                path
-              }
-            }
-          }
-        }
-      GQL
-    end
-
-    it 'returns the correct root namespace data' do
-      post_query
-
-      expect(graphql_data_at(:ciCatalogResources, :nodes)).to contain_exactly(
-        a_graphql_entity_for(
-          resource1,
-          rootNamespace: a_graphql_entity_for(namespace, :name, :path)
-        ),
-        a_graphql_entity_for(public_resource, rootNamespace: nil)
-      )
-    end
-  end
-
   describe 'openIssuesCount' do
     before_all do
       namespace.add_developer(user)