summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
commitf6e2f302412fcb32b644b379778964791789cb62 (patch)
tree29ed98fca33be12adc21ee75185a459c668fb7da /spec/models
parent95ad46159e4cd93f2b31838199180d824e041994 (diff)
downloadgitlab-ce-f6e2f302412fcb32b644b379778964791789cb62.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/application_setting_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 8307f91dfed..3ec6110d789 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -82,6 +82,11 @@ describe ApplicationSetting do
it { is_expected.not_to allow_value('abc').for(:minimum_password_length) }
it { is_expected.to allow_value(10).for(:minimum_password_length) }
+ it { is_expected.to allow_value(0).for(:namespace_storage_size_limit) }
+ it { is_expected.to allow_value(1).for(:namespace_storage_size_limit) }
+ it { is_expected.not_to allow_value(nil).for(:namespace_storage_size_limit) }
+ it { is_expected.not_to allow_value(-1).for(:namespace_storage_size_limit) }
+
context 'grafana_url validations' do
before do
subject.instance_variable_set(:@parsed_grafana_url, nil)