summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-11-07 13:48:29 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-11-07 13:48:29 +0000
commite60e591fca3dd720c9a8b3e767d7b1b9f4560967 (patch)
tree429c65cb68f5212691989ef7d10131b873239352 /spec/lib
parent0cd22a382ef390cda6dab001ab5e4738dd25b3a5 (diff)
parentd5919aeb1f751fd9d91cd051c0c14bc6e7bc3d63 (diff)
downloadgitlab-ce-e60e591fca3dd720c9a8b3e767d7b1b9f4560967.tar.gz
Merge branch 'touchup-ci-normalizer' into 'master'
Touchup Normalizer implementation See merge request gitlab-org/gitlab-ce!22872
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ci/config/normalizer_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/lib/gitlab/ci/config/normalizer_spec.rb b/spec/lib/gitlab/ci/config/normalizer_spec.rb
index 7c558cacdd5..97926695b6e 100644
--- a/spec/lib/gitlab/ci/config/normalizer_spec.rb
+++ b/spec/lib/gitlab/ci/config/normalizer_spec.rb
@@ -31,6 +31,14 @@ describe Gitlab::Ci::Config::Normalizer do
expect(configs).to all(eq(original_config))
end
+ context 'when the job is not parallelized' do
+ let(:job_config) { { script: 'rspec', name: 'rspec' } }
+
+ it 'returns the same hash' do
+ is_expected.to eq(config)
+ end
+ end
+
context 'when there is a job with a slash in it' do
let(:job_name) { :"rspec 35/2" }