summaryrefslogtreecommitdiff
path: root/spec/models/instance_configuration_spec.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-08 15:38:35 +0100
committerFilipa Lacerda <filipa@gitlab.com>2019-04-08 15:38:35 +0100
commit05d46d0568170e8c613df7fc2dfa7d611b33f9a0 (patch)
treef59abdb4bb4b24dc4cc7212eed682149e2457fd4 /spec/models/instance_configuration_spec.rb
parent383e8b1ed103def3aff37a409bb8619b55720398 (diff)
parent34f68b3e35bbfa35cb831c16643eadb4dda70039 (diff)
downloadgitlab-ce-59708-vendor-css.tar.gz
Merge branch 'master' into 59708-vendor-css59708-vendor-css
* master: Docs: Fix anchors related to variables doc Add usefull tips about big repositories Adds EE folder in the stylelint command Display maximum artifact size from runtime config
Diffstat (limited to 'spec/models/instance_configuration_spec.rb')
-rw-r--r--spec/models/instance_configuration_spec.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/models/instance_configuration_spec.rb b/spec/models/instance_configuration_spec.rb
index e65f97df3c3..43954511858 100644
--- a/spec/models/instance_configuration_spec.rb
+++ b/spec/models/instance_configuration_spec.rb
@@ -82,6 +82,13 @@ describe InstanceConfiguration do
it 'returns the key artifacts_max_size' do
expect(gitlab_ci.keys).to include(:artifacts_max_size)
end
+
+ it 'returns the key artifacts_max_size with values' do
+ stub_application_setting(max_artifacts_size: 200)
+
+ expect(gitlab_ci[:artifacts_max_size][:default]).to eq(100.megabytes)
+ expect(gitlab_ci[:artifacts_max_size][:value]).to eq(200.megabytes)
+ end
end
end
end