3 files changed, 132 insertions, 1 deletions
diff --git a/spec/requests/api/graphql/project/cluster_agents_spec.rb b/spec/requests/api/graphql/project/cluster_agents_spec.rb
index dc7254dd552..585126f3849 100644
--- a/spec/requests/api/graphql/project/cluster_agents_spec.rb
+++ b/spec/requests/api/graphql/project/cluster_agents_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'Project.cluster_agents' do
 
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:current_user) { create(:user, maintainer_projects: [project]) }
-  let_it_be(:agents) { create_list(:cluster_agent, 5, project: project) }
+  let_it_be(:agents) { create_list(:cluster_agent, 3, project: project) }
 
   let(:first) { var('Int') }
   let(:cluster_agents_fields) { nil }
@@ -105,4 +105,37 @@ RSpec.describe 'Project.cluster_agents' do
       })
     end
   end
+
+  context 'selecting activity events' do
+    let_it_be(:token) { create(:cluster_agent_token, agent: agents.first) }
+    let_it_be(:event) { create(:agent_activity_event, agent: agents.first, agent_token: token, user: current_user) }
+
+    let(:cluster_agents_fields) { [:id, query_nodes(:activity_events, of: 'ClusterAgentActivityEvent', max_depth: 2)] }
+
+    it 'retrieves activity event details' do
+      post_graphql(query, current_user: current_user)
+
+      response = graphql_data_at(:project, :cluster_agents, :nodes, :activity_events, :nodes).first
+
+      expect(response).to include({
+        'kind' => event.kind,
+        'level' => event.level,
+        'recordedAt' => event.recorded_at.iso8601,
+        'agentToken' => hash_including('name' => token.name),
+        'user' => hash_including('name' => current_user.name)
+      })
+    end
+
+    it 'preloads associations to prevent N+1 queries' do
+      user = create(:user)
+      token = create(:cluster_agent_token, agent: agents.second)
+      create(:agent_activity_event, agent: agents.second, agent_token: token, user: user)
+
+      post_graphql(query, current_user: current_user)
+
+      expect do
+        post_graphql(query, current_user: current_user)
+      end.to issue_same_number_of_queries_as { post_graphql(query, current_user: current_user, variables: [first.with(1)]) }
+    end
+  end
 end
diff --git a/spec/requests/api/graphql/project/jobs_spec.rb b/spec/requests/api/graphql/project/jobs_spec.rb
new file mode 100644
index 00000000000..1a823ede9ac
--- /dev/null
+++ b/spec/requests/api/graphql/project/jobs_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Query.project.jobs' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :repository, :public) }
+  let_it_be(:user) { create(:user) }
+
+  let(:pipeline) do
+    create(:ci_pipeline, project: project, user: user)
+  end
+
+  let(:query) do
+    <<~QUERY
+    {
+      project(fullPath: "#{project.full_path}") {
+        jobs {
+          nodes {
+            name
+            previousStageJobsAndNeeds {
+              nodes {
+                name
+              }
+            }
+          }
+        }
+      }
+    }
+    QUERY
+  end
+
+  it 'does not generate N+1 queries', :request_store, :use_sql_query_cache do
+    build_stage = create(:ci_stage_entity, position: 1, name: 'build', project: project, pipeline: pipeline)
+    test_stage = create(:ci_stage_entity, position: 2, name: 'test', project: project, pipeline: pipeline)
+    create(:ci_build, pipeline: pipeline, stage_idx: build_stage.position, name: 'docker 1 2', stage: build_stage)
+    create(:ci_build, pipeline: pipeline, stage_idx: build_stage.position, name: 'docker 2 2', stage: build_stage)
+    create(:ci_build, pipeline: pipeline, stage_idx: test_stage.position, name: 'rspec 1 2', stage: test_stage)
+    test_job = create(:ci_build, pipeline: pipeline, stage_idx: test_stage.position, name: 'rspec 2 2', stage: test_stage)
+    create(:ci_build_need, build: test_job, name: 'docker 1 2')
+
+    post_graphql(query, current_user: user)
+
+    control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+      post_graphql(query, current_user: user)
+    end
+
+    create(:ci_build, name: 'test-a', stage: test_stage, stage_idx: test_stage.position, pipeline: pipeline)
+    test_b_job = create(:ci_build, name: 'test-b', stage: test_stage, stage_idx: test_stage.position, pipeline: pipeline)
+    create(:ci_build_need, build: test_b_job, name: 'docker 2 2')
+
+    expect do
+      post_graphql(query, current_user: user)
+    end.not_to exceed_all_query_limit(control)
+  end
+end
diff --git a/spec/requests/api/graphql/project/pipeline_spec.rb b/spec/requests/api/graphql/project/pipeline_spec.rb
index d46ef313563..73e02e2a4b1 100644
--- a/spec/requests/api/graphql/project/pipeline_spec.rb
+++ b/spec/requests/api/graphql/project/pipeline_spec.rb
@@ -273,6 +273,48 @@ RSpec.describe 'getting pipeline information nested in a project' do
     end
   end
 
+  context 'N+1 queries on pipeline jobs' do
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+
+    let(:fields) do
+      <<~FIELDS
+      jobs {
+        nodes {
+          previousStageJobsAndNeeds {
+            nodes {
+              name
+            }
+          }
+        }
+      }
+      FIELDS
+    end
+
+    it 'does not generate N+1 queries', :request_store, :use_sql_query_cache do
+      build_stage = create(:ci_stage_entity, position: 1, name: 'build', project: project, pipeline: pipeline)
+      test_stage = create(:ci_stage_entity, position: 2, name: 'test', project: project, pipeline: pipeline)
+      create(:ci_build, pipeline: pipeline, stage_idx: build_stage.position, name: 'docker 1 2', stage: build_stage)
+      create(:ci_build, pipeline: pipeline, stage_idx: build_stage.position, name: 'docker 2 2', stage: build_stage)
+      create(:ci_build, pipeline: pipeline, stage_idx: test_stage.position, name: 'rspec 1 2', stage: test_stage)
+      test_job = create(:ci_build, pipeline: pipeline, stage_idx: test_stage.position, name: 'rspec 2 2', stage: test_stage)
+      create(:ci_build_need, build: test_job, name: 'docker 1 2')
+
+      post_graphql(query, current_user: current_user)
+
+      control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+        post_graphql(query, current_user: current_user)
+      end
+
+      create(:ci_build, name: 'test-a', stage: test_stage, stage_idx: test_stage.position, pipeline: pipeline)
+      test_b_job = create(:ci_build, name: 'test-b', stage: test_stage, stage_idx: test_stage.position, pipeline: pipeline)
+      create(:ci_build_need, build: test_b_job, name: 'docker 2 2')
+
+      expect do
+        post_graphql(query, current_user: current_user)
+      end.not_to exceed_all_query_limit(control)
+    end
+  end
+
   context 'N+1 queries on stages jobs' do
     let(:depth) { 5 }
     let(:fields) do