diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 18:10:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 18:10:27 +0300 |
| commit | 5facc34f44ce8736078127a5df174a7b52d922b4 (patch) | |
| tree | b93fbe904139121e82870cc40e5ab240a97b1f08 /spec/graphql | |
| parent | ea1dcaef18edf97b3ac73892d64ebaf5eecd7f68 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/graphql')
| -rw-r--r-- | spec/graphql/types/ci/job_type_spec.rb | 2 | ||||
| -rw-r--r-- | spec/graphql/types/ci/pipeline_type_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/graphql/types/ci/job_type_spec.rb b/spec/graphql/types/ci/job_type_spec.rb index 4654b55eea5..ba9793dbc27 100644 --- a/spec/graphql/types/ci/job_type_spec.rb +++ b/spec/graphql/types/ci/job_type_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Types::Ci::JobType do pipeline queued_at scheduledAt - scheduledAt + schedulingType shortSha stage started_at diff --git a/spec/graphql/types/ci/pipeline_type_spec.rb b/spec/graphql/types/ci/pipeline_type_spec.rb index 13021c00aec..0781e84e5ae 100644 --- a/spec/graphql/types/ci/pipeline_type_spec.rb +++ b/spec/graphql/types/ci/pipeline_type_spec.rb @@ -11,8 +11,8 @@ 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 job source_job downstream - upstream path project active user_permissions warnings commit_path + stages user retryable cancelable jobs source_job job downstream + upstream path project active user_permissions warnings commit_path uses_needs ] if Gitlab.ee? |