diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /spec/graphql/resolvers/ci/config_resolver_spec.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'spec/graphql/resolvers/ci/config_resolver_spec.rb')
-rw-r--r-- | spec/graphql/resolvers/ci/config_resolver_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/graphql/resolvers/ci/config_resolver_spec.rb b/spec/graphql/resolvers/ci/config_resolver_spec.rb index 3ff6d8f4347..7a6104fc503 100644 --- a/spec/graphql/resolvers/ci/config_resolver_spec.rb +++ b/spec/graphql/resolvers/ci/config_resolver_spec.rb @@ -37,13 +37,15 @@ RSpec.describe Resolvers::Ci::ConfigResolver do merged_yaml: content, jobs: [], errors: [], - warnings: [] + warnings: [], + includes: [] ) end it 'lints the ci config file and returns the merged yaml file' do expect(response[:status]).to eq(:valid) expect(response[:merged_yaml]).to eq(content) + expect(response[:includes]).to eq([]) expect(response[:errors]).to be_empty expect(::Gitlab::Ci::Lint).to have_received(:new).with(current_user: user, project: project, sha: sha) end @@ -69,7 +71,8 @@ RSpec.describe Resolvers::Ci::ConfigResolver do jobs: [], merged_yaml: content, errors: ['Invalid configuration format'], - warnings: [] + warnings: [], + includes: [] ) end |