1 files changed, 61 insertions, 23 deletions

diff --git a/spec/requests/api/graphql/project/issues_spec.rb b/spec/requests/api/graphql/project/issues_spec.rb
index 9c915075c42..dd9d44136e5 100644
--- a/spec/requests/api/graphql/project/issues_spec.rb
+++ b/spec/requests/api/graphql/project/issues_spec.rb
@@ -5,14 +5,15 @@ require 'spec_helper'
 RSpec.describe 'getting an issue list for a project' do
   include GraphqlHelpers
 
-  let(:issues_data) { graphql_data['project']['issues']['edges'] }
-
   let_it_be(:project) { create(:project, :repository, :public) }
   let_it_be(:current_user) { create(:user) }
   let_it_be(:issue_a, reload: true) { create(:issue, project: project, discussion_locked: true) }
   let_it_be(:issue_b, reload: true) { create(:issue, :with_alert, project: project) }
   let_it_be(:issues, reload: true) { [issue_a, issue_b] }
 
+  let(:issues_data) { graphql_data['project']['issues']['edges'] }
+  let(:issue_filter_params) { {} }
+
   let(:fields) do
     <<~QUERY
     edges {
@@ -27,7 +28,7 @@ RSpec.describe 'getting an issue list for a project' do
     graphql_query_for(
       'project',
       { 'fullPath' => project.full_path },
-      query_graphql_field('issues', {}, fields)
+      query_graphql_field('issues', issue_filter_params, fields)
     )
   end
 
@@ -50,6 +51,16 @@ RSpec.describe 'getting an issue list for a project' do
     expect(issues_data[1]['node']['discussionLocked']).to eq(true)
   end
 
+  context 'when both assignee_username filters are provided' do
+    let(:issue_filter_params) { { assignee_username: current_user.username, assignee_usernames: [current_user.username] } }
+
+    it 'returns a mutually exclusive param error' do
+      post_graphql(query, current_user: current_user)
+
+      expect_graphql_errors_to_include('only one of [assigneeUsernames, assigneeUsername] arguments is allowed at the same time.')
+    end
+  end
+
   context 'when limiting the number of results' do
     let(:query) do
       <<~GQL
@@ -76,7 +87,7 @@ RSpec.describe 'getting an issue list for a project' do
       end
     end
 
-    context 'no limit is provided' do
+    context 'when no limit is provided' do
       let(:issue_limit) { nil }
 
       it 'returns all issues' do
@@ -143,13 +154,15 @@ RSpec.describe 'getting an issue list for a project' do
     let_it_be(:data_path) { [:project, :issues] }
 
     def pagination_query(params)
-      graphql_query_for(:project, { full_path: sort_project.full_path },
+      graphql_query_for(
+        :project,
+        { full_path: sort_project.full_path },
         query_graphql_field(:issues, params, "#{page_info} nodes { iid }")
       )
     end
 
     def pagination_results_data(data)
-      data.map { |issue| issue.dig('iid').to_i }
+      data.map { |issue| issue['iid'].to_i }
     end
 
     context 'when sorting by due date' do
@@ -189,27 +202,38 @@ RSpec.describe 'getting an issue list for a project' do
         it_behaves_like 'sorted paginated query' do
           let(:sort_param)       { :RELATIVE_POSITION_ASC }
           let(:first_param)      { 2 }
-          let(:expected_results) { [relative_issue5.iid, relative_issue3.iid, relative_issue1.iid, relative_issue4.iid, relative_issue2.iid] }
+          let(:expected_results) do
+            [
+              relative_issue5.iid, relative_issue3.iid, relative_issue1.iid,
+              relative_issue4.iid, relative_issue2.iid
+            ]
+          end
         end
       end
     end
 
     context 'when sorting by priority' do
       let_it_be(:sort_project) { create(:project, :public) }
-      let_it_be(:early_milestone) { create(:milestone, project: sort_project, due_date: 10.days.from_now) }
-      let_it_be(:late_milestone) { create(:milestone, project: sort_project, due_date: 30.days.from_now) }
-      let_it_be(:priority_label1) { create(:label, project: sort_project, priority: 1) }
-      let_it_be(:priority_label2) { create(:label, project: sort_project, priority: 5) }
-      let_it_be(:priority_issue1) { create(:issue, project: sort_project, labels: [priority_label1], milestone: late_milestone) }
-      let_it_be(:priority_issue2) { create(:issue, project: sort_project, labels: [priority_label2]) }
-      let_it_be(:priority_issue3) { create(:issue, project: sort_project, milestone: early_milestone) }
-      let_it_be(:priority_issue4) { create(:issue, project: sort_project) }
+      let_it_be(:on_project) { { project: sort_project } }
+      let_it_be(:early_milestone) { create(:milestone, **on_project, due_date: 10.days.from_now) }
+      let_it_be(:late_milestone) { create(:milestone, **on_project, due_date: 30.days.from_now) }
+      let_it_be(:priority_1) { create(:label, **on_project, priority: 1) }
+      let_it_be(:priority_2) { create(:label, **on_project, priority: 5) }
+      let_it_be(:priority_issue1) { create(:issue, **on_project, labels: [priority_1], milestone: late_milestone) }
+      let_it_be(:priority_issue2) { create(:issue, **on_project, labels: [priority_2]) }
+      let_it_be(:priority_issue3) { create(:issue, **on_project, milestone: early_milestone) }
+      let_it_be(:priority_issue4) { create(:issue, **on_project) }
 
       context 'when ascending' do
         it_behaves_like 'sorted paginated query' do
           let(:sort_param)       { :PRIORITY_ASC }
           let(:first_param)      { 2 }
-          let(:expected_results) { [priority_issue3.iid, priority_issue1.iid, priority_issue2.iid, priority_issue4.iid] }
+          let(:expected_results) do
+            [
+              priority_issue3.iid, priority_issue1.iid,
+              priority_issue2.iid, priority_issue4.iid
+            ]
+          end
         end
       end
 
@@ -217,7 +241,9 @@ RSpec.describe 'getting an issue list for a project' do
         it_behaves_like 'sorted paginated query' do
           let(:sort_param)       { :PRIORITY_DESC }
           let(:first_param)      { 2 }
-          let(:expected_results) { [priority_issue1.iid, priority_issue3.iid, priority_issue2.iid, priority_issue4.iid] }
+          let(:expected_results) do
+            [priority_issue1.iid, priority_issue3.iid, priority_issue2.iid, priority_issue4.iid]
+          end
         end
       end
     end
@@ -275,7 +301,7 @@ RSpec.describe 'getting an issue list for a project' do
     end
   end
 
-  context 'fetching alert management alert' do
+  context 'when fetching alert management alert' do
     let(:fields) do
       <<~QUERY
       edges {
@@ -297,7 +323,7 @@ RSpec.describe 'getting an issue list for a project' do
     it 'avoids N+1 queries' do
       control = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
 
-      create(:alert_management_alert, :with_issue, project: project )
+      create(:alert_management_alert, :with_issue, project: project)
 
       expect { post_graphql(query, current_user: current_user) }.not_to exceed_query_limit(control)
     end
@@ -312,7 +338,7 @@ RSpec.describe 'getting an issue list for a project' do
     end
   end
 
-  context 'fetching labels' do
+  context 'when fetching labels' do
     let(:fields) do
       <<~QUERY
         edges {
@@ -362,7 +388,7 @@ RSpec.describe 'getting an issue list for a project' do
     end
   end
 
-  context 'fetching assignees' do
+  context 'when fetching assignees' do
     let(:fields) do
       <<~QUERY
         edges {
@@ -420,9 +446,10 @@ RSpec.describe 'getting an issue list for a project' do
       query = graphql_query_for(
         :project,
         { full_path: project.full_path },
-        query_graphql_field(:issues, search_params, [
+        query_graphql_field(
+          :issues, search_params,
           query_graphql_field(:nodes, nil, requested_fields)
-        ])
+        )
       )
       post_graphql(query, current_user: current_user)
     end
@@ -448,5 +475,16 @@ RSpec.describe 'getting an issue list for a project' do
 
       include_examples 'N+1 query check'
     end
+
+    context 'when requesting `timelogs`' do
+      let(:requested_fields) { 'timelogs { nodes { timeSpent } }' }
+
+      before do
+        create_list(:issue_timelog, 2, issue: issue_a)
+        create(:issue_timelog, issue: issue_b)
+      end
+
+      include_examples 'N+1 query check'
+    end
   end
 end