Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 14 deletions

diff --git a/spec/requests/api/graphql/ci/catalog/resource_spec.rb b/spec/requests/api/graphql/ci/catalog/resource_spec.rb
index 9fe73e7ba45..24f9b6031f4 100644
--- a/spec/requests/api/graphql/ci/catalog/resource_spec.rb
+++ b/spec/requests/api/graphql/ci/catalog/resource_spec.rb
@@ -164,8 +164,8 @@ RSpec.describe 'Query.ciCatalogResource', feature_category: :pipeline_compositio
             versions {
               nodes {
                 id
-                tagName
-                tagPath
+                name
+                path
                 releasedAt
                 author {
                   id
@@ -202,15 +202,15 @@ RSpec.describe 'Query.ciCatalogResource', feature_category: :pipeline_compositio
         expect(graphql_data_at(:ciCatalogResource, :versions, :nodes)).to contain_exactly(
           a_graphql_entity_for(
             version1,
-            tagName: version1.name,
-            tagPath: project_tag_path(project, version1.name),
+            name: version1.name,
+            path: project_tag_path(project, version1.name),
             releasedAt: version1.released_at,
             author: a_graphql_entity_for(author, :name)
           ),
           a_graphql_entity_for(
             version2,
-            tagName: version2.name,
-            tagPath: project_tag_path(project, version2.name),
+            name: version2.name,
+            path: project_tag_path(project, version2.name),
             releasedAt: version2.released_at,
             author: a_graphql_entity_for(author, :name)
           )
@@ -237,8 +237,8 @@ RSpec.describe 'Query.ciCatalogResource', feature_category: :pipeline_compositio
             id
             latestVersion {
               id
-              tagName
-              tagPath
+              name
+              path
               releasedAt
               author {
                 id
@@ -273,8 +273,8 @@ RSpec.describe 'Query.ciCatalogResource', feature_category: :pipeline_compositio
             resource,
             latestVersion: a_graphql_entity_for(
               latest_version,
-              tagName: latest_version.name,
-              tagPath: project_tag_path(project, latest_version.name),
+              name: latest_version.name,
+              path: project_tag_path(project, latest_version.name),
               releasedAt: latest_version.released_at,
               author: a_graphql_entity_for(author, :name)
             )
diff --git a/spec/requests/api/graphql/ci/catalog/resources_spec.rb b/spec/requests/api/graphql/ci/catalog/resources_spec.rb
index 49a3f3be1d7..150507fc442 100644
--- a/spec/requests/api/graphql/ci/catalog/resources_spec.rb
+++ b/spec/requests/api/graphql/ci/catalog/resources_spec.rb
@@ -106,7 +106,7 @@ RSpec.describe 'Query.ciCatalogResources', feature_category: :pipeline_compositi
               versions {
                 nodes {
                   id
-                  tagName
+                  name
                   releasedAt
                   author {
                     id
@@ -153,7 +153,7 @@ RSpec.describe 'Query.ciCatalogResources', feature_category: :pipeline_compositi
               id
               latestVersion {
                 id
-                tagName
+                name
                 releasedAt
                 author {
                   id
@@ -185,7 +185,7 @@ RSpec.describe 'Query.ciCatalogResources', feature_category: :pipeline_compositi
           resource1,
           latestVersion: a_graphql_entity_for(
             latest_version1,
-            tagName: latest_version1.name,
+            name: latest_version1.name,
             releasedAt: latest_version1.released_at,
             author: a_graphql_entity_for(author1, :name)
           )
@@ -194,7 +194,7 @@ RSpec.describe 'Query.ciCatalogResources', feature_category: :pipeline_compositi
           public_resource,
           latestVersion: a_graphql_entity_for(
             latest_version2,
-            tagName: latest_version2.name,
+            name: latest_version2.name,
             releasedAt: latest_version2.released_at,
             author: a_graphql_entity_for(author2, :name)
           )
diff --git a/spec/requests/api/graphql/mutations/work_items/create_spec.rb b/spec/requests/api/graphql/mutations/work_items/create_spec.rb
index 78b93c3210b..2c2cd5f2acc 100644
--- a/spec/requests/api/graphql/mutations/work_items/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/work_items/create_spec.rb
@@ -281,6 +281,18 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
 
       it_behaves_like 'creates work item'
 
+      # This is a temporary measure just to ensure the internal id migration doesn't get conflicts
+      # More info in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139367
+      context 'when making the request in a production environment' do
+        before do
+          stub_rails_env('production')
+        end
+
+        it_behaves_like 'a mutation that returns top-level errors', errors: [
+          'Group level work items are disabled. Only project paths allowed in `namespacePath`.'
+        ]
+      end
+
       context 'when the namespace_level_work_items feature flag is disabled' do
         before do
           stub_feature_flags(namespace_level_work_items: false)