Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 89 insertions, 1 deletions

diff --git a/spec/graphql/types/ci/pipeline_counts_type_spec.rb b/spec/graphql/types/ci/pipeline_counts_type_spec.rb
new file mode 100644
index 00000000000..7fdb286d253
--- /dev/null
+++ b/spec/graphql/types/ci/pipeline_counts_type_spec.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GitlabSchema.types['PipelineCounts'] do
+  include GraphqlHelpers
+
+  let(:current_user) { create(:user) }
+
+  let_it_be(:project) { create(:project, :private) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
+  let_it_be(:failed_pipeline) { create(:ci_pipeline, :failed, project: project) }
+  let_it_be(:success_pipeline) { create(:ci_pipeline, :success, project: project) }
+  let_it_be(:ref_pipeline) { create(:ci_pipeline, project: project, ref: 'awesome-feature') }
+  let_it_be(:sha_pipeline) { create(:ci_pipeline, :running, project: project, sha: 'deadbeef') }
+  let_it_be(:on_demand_dast_scan) { create(:ci_pipeline, :success, project: project, source: 'ondemand_dast_scan') }
+
+  before do
+    project.add_developer(current_user)
+  end
+
+  specify { expect(described_class.graphql_name).to eq('PipelineCounts') }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      all
+      finished
+      pending
+      running
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+
+  shared_examples 'pipeline counts query' do |args: "", expected_counts:|
+    let_it_be(:query) do
+      %(
+        query {
+          project(fullPath: "#{project.full_path}") {
+            pipelineCounts#{args} {
+              all
+              finished
+              pending
+              running
+            }
+          }
+        }
+      )
+    end
+
+    subject { GitlabSchema.execute(query, context: { current_user: current_user }).as_json }
+
+    it 'returns pipeline counts' do
+      actual_counts = subject.dig('data', 'project', 'pipelineCounts')
+
+      expect(actual_counts).to eq(expected_counts)
+    end
+  end
+
+  it_behaves_like "pipeline counts query", args: "", expected_counts: {
+    "all" => 6,
+    "finished" => 3,
+    "pending" => 2,
+    "running" => 1
+  }
+
+  it_behaves_like "pipeline counts query", args: '(ref: "awesome-feature")', expected_counts: {
+    "all" => 1,
+    "finished" => 0,
+    "pending" => 1,
+    "running" => 0
+  }
+
+  it_behaves_like "pipeline counts query", args: '(sha: "deadbeef")', expected_counts: {
+    "all" => 1,
+    "finished" => 0,
+    "pending" => 0,
+    "running" => 1
+  }
+
+  it_behaves_like "pipeline counts query", args: '(source: "ondemand_dast_scan")', expected_counts: {
+    "all" => 1,
+    "finished" => 1,
+    "pending" => 0,
+    "running" => 0
+  }
+end
diff --git a/spec/graphql/types/ci/runner_type_spec.rb b/spec/graphql/types/ci/runner_type_spec.rb
index 43d8b585d6b..7697cd0ef79 100644
--- a/spec/graphql/types/ci/runner_type_spec.rb
+++ b/spec/graphql/types/ci/runner_type_spec.rb
@@ -9,9 +9,10 @@ RSpec.describe GitlabSchema.types['CiRunner'] do
 
   it 'contains attributes related to a runner' do
     expected_fields = %w[
-      id description created_at contacted_at maximum_timeout access_level active status
+      id description created_at contacted_at maximum_timeout access_level active paused status
       version short_sha revision locked run_untagged ip_address runner_type tag_list
       project_count job_count admin_url edit_admin_url user_permissions executor_name
+      groups projects jobs token_expires_at
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)