diff options
Diffstat (limited to 'spec/lib/gitlab/ci/config/normalizer_spec.rb')
-rw-r--r-- | spec/lib/gitlab/ci/config/normalizer_spec.rb | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/spec/lib/gitlab/ci/config/normalizer_spec.rb b/spec/lib/gitlab/ci/config/normalizer_spec.rb index 949af8cdc4c..4c19657413c 100644 --- a/spec/lib/gitlab/ci/config/normalizer_spec.rb +++ b/spec/lib/gitlab/ci/config/normalizer_spec.rb @@ -178,8 +178,8 @@ RSpec.describe Gitlab::Ci::Config::Normalizer do { matrix: [ { - VAR_1: [1], - VAR_2: [2, 3] + VAR_1: ['A'], + VAR_2: %w[B C] } ] } @@ -187,8 +187,8 @@ RSpec.describe Gitlab::Ci::Config::Normalizer do let(:expanded_job_names) do [ - 'rspec 1/2', - 'rspec 2/2' + 'rspec: [A, B]', + 'rspec: [A, C]' ] end @@ -196,21 +196,17 @@ RSpec.describe Gitlab::Ci::Config::Normalizer do is_expected.not_to include(job_name) end - it 'has parallelized jobs' do - is_expected.to include(*expanded_job_names.map(&:to_sym)) - end - it 'sets job instance in options' do expect(subject.values).to all(include(:instance)) end it 'sets job variables', :aggregate_failures do expect(subject.values[0]).to match( - a_hash_including(variables: { VAR_1: 1, VAR_2: 2, USER_VARIABLE: 'user value' }) + a_hash_including(variables: { VAR_1: 'A', VAR_2: 'B', USER_VARIABLE: 'user value' }) ) expect(subject.values[1]).to match( - a_hash_including(variables: { VAR_1: 1, VAR_2: 3, USER_VARIABLE: 'user value' }) + a_hash_including(variables: { VAR_1: 'A', VAR_2: 'C', USER_VARIABLE: 'user value' }) ) end @@ -226,6 +222,10 @@ RSpec.describe Gitlab::Ci::Config::Normalizer do expect(configs).to all(match(a_hash_including(original_config))) end + it 'has parallelized jobs' do + is_expected.to include(*expanded_job_names.map(&:to_sym)) + end + it_behaves_like 'parallel dependencies' it_behaves_like 'parallel needs' end @@ -238,5 +238,11 @@ RSpec.describe Gitlab::Ci::Config::Normalizer do is_expected.to match(config) end end + + context 'when jobs config is nil' do + let(:config) { nil } + + it { is_expected.to eq({}) } + end end end |