Add latest changes from gitlab-org/gitlab@master

4 files changed, 28 insertions, 7 deletions

diff --git a/spec/graphql/types/ci/job_status_enum_spec.rb b/spec/graphql/types/ci/job_status_enum_spec.rb
new file mode 100644
index 00000000000..e8a1a2e0aa8
--- /dev/null
+++ b/spec/graphql/types/ci/job_status_enum_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GitlabSchema.types['CiJobStatus'] do
+  it 'exposes all job status values' do
+    expect(described_class.values.values).to contain_exactly(
+      *::Ci::HasStatus::AVAILABLE_STATUSES.map do |status|
+        have_attributes(value: status, graphql_name: status.upcase)
+      end
+    )
+  end
+end
diff --git a/spec/graphql/types/ci/job_type_spec.rb b/spec/graphql/types/ci/job_type_spec.rb
index c54137a1c3e..4654b55eea5 100644
--- a/spec/graphql/types/ci/job_type_spec.rb
+++ b/spec/graphql/types/ci/job_type_spec.rb
@@ -8,16 +8,23 @@ RSpec.describe Types::Ci::JobType do
 
   it 'exposes the expected fields' do
     expected_fields = %i[
+      allow_failure
+      artifacts
+      created_at
+      detailedStatus
+      duration
+      finished_at
       id
-      shortSha
-      pipeline
       name
       needs
-      detailedStatus
+      pipeline
+      queued_at
       scheduledAt
-      artifacts
-      finished_at
-      duration
+      scheduledAt
+      shortSha
+      stage
+      started_at
+      status
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/ci/pipeline_type_spec.rb b/spec/graphql/types/ci/pipeline_type_spec.rb
index e0e84a1b635..13021c00aec 100644
--- a/spec/graphql/types/ci/pipeline_type_spec.rb
+++ b/spec/graphql/types/ci/pipeline_type_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Types::Ci::PipelineType do
     expected_fields = %w[
       id iid sha before_sha status detailed_status config_source duration
       coverage created_at updated_at started_at finished_at committed_at
-      stages user retryable cancelable jobs source_job downstream
+      stages user retryable cancelable jobs job source_job downstream
       upstream path project active user_permissions warnings commit_path
     ]
 
diff --git a/spec/graphql/types/ci/stage_type_spec.rb b/spec/graphql/types/ci/stage_type_spec.rb
index 9a8d4fa96a3..cb8c1cb02cd 100644
--- a/spec/graphql/types/ci/stage_type_spec.rb
+++ b/spec/graphql/types/ci/stage_type_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe Types::Ci::StageType do
       name
       groups
       detailedStatus
+      jobs
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)