diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/lib/gitlab/ci/config/entry/job_spec.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/lib/gitlab/ci/config/entry/job_spec.rb')
-rw-r--r-- | spec/lib/gitlab/ci/config/entry/job_spec.rb | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb index ffcd029172a..1d23ab0c2c7 100644 --- a/spec/lib/gitlab/ci/config/entry/job_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb @@ -556,42 +556,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do end end - context 'with multiple_cache_per_job FF disabled' do - before do - stub_feature_flags(multiple_cache_per_job: false) - end - - context 'when job config overrides default config' do - before do - entry.compose!(deps) - end - - let(:config) do - { script: 'rspec', image: 'some_image', cache: { key: 'test' } } - end - - it 'overrides default config' do - expect(entry[:image].value).to eq(name: 'some_image') - expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success') - end - end - - context 'when job config does not override default config' do - before do - allow(default).to receive('[]').with(:image).and_return(specified) - - entry.compose!(deps) - end - - let(:config) { { script: 'ls', cache: { key: 'test' } } } - - it 'uses config from default entry' do - expect(entry[:image].value).to eq 'specified' - expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success') - end - end - end - context 'with workflow rules' do using RSpec::Parameterized::TableSyntax |