Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

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