Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-14 19:27:13 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-15 13:18:14 +0300
commit7b712d359880cb15bad4c0f01308bf12b1518e60 (patch)
treebdeac924e9cb9bcc51daa0a52ed7274465f5148d /spec/lib/gitlab/ci/config
parent0cba9bef8a399e8f2003fee23fbda6f525921175 (diff)
Make default config entry value configurable
Introduce `default:` configuration entry setting that makes it possible to configure a default value of an entry, what overrides class-level `def self.default` value.
Diffstat (limited to 'spec/lib/gitlab/ci/config')
-rw-r--r--spec/lib/gitlab/ci/config/entry/policy_spec.rb33
1 files changed, 5 insertions, 28 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/policy_spec.rb b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
index d3e84298f1e..1c987e13a9a 100644
--- a/spec/lib/gitlab/ci/config/entry/policy_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
@@ -169,9 +169,9 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
describe '#value' do
- context 'when it is `only` policy' do
+ context 'when default value has been provided' do
before do
- entry.key = :only
+ entry.default = { refs: %w[branches tags] }
end
context 'when user overrides default values' do
@@ -182,7 +182,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
end
- context 'when user does not override default values' do
+ context 'when default value has not been defined' do
let(:config) { { variables: %w[$VARIABLE] } }
it 'includes default values' do
@@ -191,34 +191,11 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
end
end
-
- context 'when it is `except` policy' do
- before do
- entry.key = :except
- end
-
- context 'when user does not override default values' do
- let(:config) { { variables: %w[$VARIABLE] } }
-
- it 'does not include default values' do
- expect(entry.value).to eq config
- end
- end
- end
end
describe '.default' do
- context 'when `only` policy is about to be fabricated' do
- it 'has a default value' do
- expect(described_class.default(key: :only))
- .to eq(refs: %w[branches tags])
- end
- end
-
- context 'when `except` policy is about to be fabricated' do
- it 'does not have a default value' do
- expect(described_class.default(key: :except)).to be_nil
- end
+ it 'does not have default policy' do
+ expect(described_class.default).to be_nil
end
end
end