diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:05 +0300 |
commit | f78257cbddd711e18cbce93ad740a4aa0acac347 (patch) | |
tree | 7f018abe3ce1c0010879cc480f348a35e616fabb /spec/support/shared_examples/lib/gitlab | |
parent | f500600a43b531e2e7a5858b74bd35312b02c349 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/shared_examples/lib/gitlab')
-rw-r--r-- | spec/support/shared_examples/lib/gitlab/config/inheritable_shared_examples.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/support/shared_examples/lib/gitlab/config/inheritable_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/config/inheritable_shared_examples.rb index 556d81133bc..95772b1774a 100644 --- a/spec/support/shared_examples/lib/gitlab/config/inheritable_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/config/inheritable_shared_examples.rb @@ -53,7 +53,7 @@ RSpec.shared_examples 'with inheritable CI config' do let(:deps) do if inheritable_key - double('deps', inheritable_key => inheritable, '[]' => unspecified) + double('deps', "#{inheritable_key}_entry" => inheritable, '[]' => unspecified) else inheritable end @@ -68,7 +68,7 @@ RSpec.shared_examples 'with inheritable CI config' do it 'does inherit value' do expect(inheritable).to receive('[]').with(entry_key).and_return(specified) - entry.compose!(deps) + entry.send(:inherit!, deps) expect(entry[entry_key]).to eq(specified) end @@ -86,7 +86,7 @@ RSpec.shared_examples 'with inheritable CI config' do expect do # we ignore exceptions as `#overwrite_entry` # can raise exception on duplicates - entry.compose!(deps) rescue described_class::InheritError + entry.send(:inherit!, deps) rescue described_class::InheritError end.not_to change { entry[entry_key] } end end @@ -94,7 +94,7 @@ RSpec.shared_examples 'with inheritable CI config' do context 'when inheritable does not specify' do it 'does not inherit value' do - entry.compose!(deps) + entry.send(:inherit!, deps) expect(entry[entry_key]).to be_a( Gitlab::Config::Entry::Undefined) |