summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-09-02 01:00:29 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-09-02 01:00:29 +0000
commit6e744f7071f435b453223445e0097bf114c4aaa0 (patch)
tree083baf94524744200a1a36d271a0eb5971d33d53 /spec/lib
parenteaae9cec212c2ff60c4fbe7074f16039166b379c (diff)
parentbf50573710ca008081063338664ec8b47a87d059 (diff)
downloadgitlab-ce-6e744f7071f435b453223445e0097bf114c4aaa0.tar.gz
Merge branch 'sh-fix-ci-lint-500-error' into 'master'
Fix 500 error in CI lint when included templates are an array Closes #66605 See merge request gitlab-org/gitlab-ce!32232
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ci/config/external/file/base_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/lib/gitlab/ci/config/external/file/base_spec.rb b/spec/lib/gitlab/ci/config/external/file/base_spec.rb
index dd536a241bd..af995f4869a 100644
--- a/spec/lib/gitlab/ci/config/external/file/base_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/file/base_spec.rb
@@ -41,6 +41,12 @@ describe Gitlab::Ci::Config::External::File::Base do
end
describe '#valid?' do
+ context 'when location is not a string' do
+ let(:location) { %w(some/file.txt other/file.txt) }
+
+ it { is_expected.not_to be_valid }
+ end
+
context 'when location is not a YAML file' do
let(:location) { 'some/file.txt' }