summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/ci/yaml_processor_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 12:06:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-01 12:06:26 +0000
commitdeed6022efe0149d88c57ef1df736c83465643f9 (patch)
tree4cf4c7c1ce765e83547129607b6bd3881c0fad6b /spec/lib/gitlab/ci/yaml_processor_spec.rb
parentf7a13c56bf0ed7ff9591bf4cbf9e50487255c4bc (diff)
downloadgitlab-ce-deed6022efe0149d88c57ef1df736c83465643f9.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.rb15
1 files changed, 13 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index c7ea6ed9ddb..c747ea670bb 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -1293,7 +1293,7 @@ module Gitlab
end
end
- describe "Job Needs" do
+ describe "Needs" do
let(:needs) { }
let(:dependencies) { }
@@ -1333,7 +1333,12 @@ module Gitlab
stage: "test",
stage_idx: 2,
name: "test1",
- options: { script: ["test"] },
+ options: {
+ script: ["test"],
+ # This does not make sense, there is a follow-up:
+ # https://gitlab.com/gitlab-org/gitlab-foss/issues/65569
+ bridge_needs: %w[build1 build2]
+ },
needs_attributes: [
{ name: "build1" },
{ name: "build2" }
@@ -1345,6 +1350,12 @@ module Gitlab
end
end
+ context 'needs two builds defined as symbols' do
+ let(:needs) { [:build1, :build2] }
+
+ it { expect { subject }.not_to raise_error }
+ end
+
context 'undefined need' do
let(:needs) { ['undefined'] }