summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/ci/yaml_processor_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-16 15:10:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-16 15:10:05 +0000
commitd872c89ce4828a16d72ddeed8695077fdcaf7b30 (patch)
tree1c982aed87c3bfb90a518970368b88257aecf2ab /spec/lib/gitlab/ci/yaml_processor_spec.rb
parent09dff3eec735ccbe001d165293ecebf195452071 (diff)
downloadgitlab-ce-d872c89ce4828a16d72ddeed8695077fdcaf7b30.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/ci/yaml_processor_spec.rb')
-rw-r--r--spec/lib/gitlab/ci/yaml_processor_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index dc443c5a1c1..49a470f9e01 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -2781,7 +2781,7 @@ module Gitlab
expect(subject.valid?).to eq(false)
expect(subject.errors).to contain_exactly(
'jobs:rspec config contains unknown keys: bad_tags',
- 'jobs:rspec rules should be an array of hashes')
+ 'jobs:rspec rules should be an array containing hashes and arrays of hashes')
end
end