Commit 224509ed authored by Grzegorz Bizon's avatar Grzegorz Bizon

Improve YAML processor specs and remove unused code

parent 90524935
...@@ -978,13 +978,13 @@ module Gitlab ...@@ -978,13 +978,13 @@ module Gitlab
context 'when template is a job' do context 'when template is a job' do
let(:config) do let(:config) do
<<EOT <<~EOT
job1: &JOBTMPL job1: &JOBTMPL
stage: build stage: build
script: execute-script-for-job script: execute-script-for-job
job2: *JOBTMPL job2: *JOBTMPL
EOT EOT
end end
it_behaves_like 'job_templates_handling' it_behaves_like 'job_templates_handling'
...@@ -992,15 +992,15 @@ EOT ...@@ -992,15 +992,15 @@ EOT
context 'when template is a hidden job' do context 'when template is a hidden job' do
let(:config) do let(:config) do
<<EOT <<~EOT
.template: &JOBTMPL .template: &JOBTMPL
stage: build stage: build
script: execute-script-for-job script: execute-script-for-job
job1: *JOBTMPL job1: *JOBTMPL
job2: *JOBTMPL job2: *JOBTMPL
EOT EOT
end end
it_behaves_like 'job_templates_handling' it_behaves_like 'job_templates_handling'
...@@ -1008,18 +1008,18 @@ EOT ...@@ -1008,18 +1008,18 @@ EOT
context 'when job adds its own keys to a template definition' do context 'when job adds its own keys to a template definition' do
let(:config) do let(:config) do
<<EOT <<~EOT
.template: &JOBTMPL .template: &JOBTMPL
stage: build stage: build
job1: job1:
<<: *JOBTMPL <<: *JOBTMPL
script: execute-script-for-job script: execute-script-for-job
job2: job2:
<<: *JOBTMPL <<: *JOBTMPL
script: execute-script-for-job script: execute-script-for-job
EOT EOT
end end
it_behaves_like 'job_templates_handling' it_behaves_like 'job_templates_handling'
...@@ -1358,10 +1358,6 @@ EOT ...@@ -1358,10 +1358,6 @@ EOT
it { is_expected.to be_nil } it { is_expected.to be_nil }
end end
end end
def pipeline(**attributes)
build_stubbed(:ci_empty_pipeline, **attributes)
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment