Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 9 insertions, 46 deletions

diff --git a/spec/requests/api/graphql/group/work_item_types_spec.rb b/spec/requests/api/graphql/group/work_item_types_spec.rb
index 791c0fb9524..fbebcdad389 100644
--- a/spec/requests/api/graphql/group/work_item_types_spec.rb
+++ b/spec/requests/api/graphql/group/work_item_types_spec.rb
@@ -5,56 +5,19 @@ require 'spec_helper'
 RSpec.describe 'getting a list of work item types for a group', feature_category: :team_planning do
   include GraphqlHelpers
 
-  let_it_be(:developer) { create(:user) }
   let_it_be(:group) { create(:group, :private) }
+  let_it_be(:developer) { create(:user).tap { |u| group.add_developer(u) } }
 
-  before_all do
-    group.add_developer(developer)
-  end
-
-  let(:current_user) { developer }
-
-  let(:fields) do
-    <<~GRAPHQL
-      workItemTypes{
-        nodes { id name iconName }
-      }
-    GRAPHQL
-  end
-
-  let(:query) do
-    graphql_query_for(
-      'group',
-      { 'fullPath' => group.full_path },
-      fields
-    )
-  end
-
-  context 'when user has access to the group' do
-    before do
-      post_graphql(query, current_user: current_user)
-    end
+  it_behaves_like 'graphql work item type list request spec' do
+    let(:current_user) { developer }
+    let(:parent_key) { :group }
 
-    it_behaves_like 'a working graphql query'
-
-    it 'returns all default work item types' do
-      expect(graphql_data.dig('group', 'workItemTypes', 'nodes')).to match_array(
-        WorkItems::Type.default.map do |type|
-          hash_including('id' => type.to_global_id.to_s, 'name' => type.name, 'iconName' => type.icon_name)
-        end
+    let(:query) do
+      graphql_query_for(
+        'group',
+        { 'fullPath' => group.full_path },
+        query_nodes('WorkItemTypes', work_item_type_fields)
       )
     end
   end
-
-  context "when user doesn't have access to the group" do
-    let(:current_user) { create(:user) }
-
-    before do
-      post_graphql(query, current_user: current_user)
-    end
-
-    it 'does not return the group' do
-      expect(graphql_data).to eq('group' => nil)
-    end
-  end
 end