diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-02-19 10:55:13 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-02-19 22:04:08 +1300 |
commit | 8a1b6041c8af7007c80de87221e20512810be26d (patch) | |
tree | b02ed1a336400b64f26060e30c77162e568a0e68 | |
parent | fe10964a6884162b9272ec3a32a5736c2a997ab2 (diff) | |
download | gitlab-ce-8a1b6041c8af7007c80de87221e20512810be26d.tar.gz |
Use Gitlab::CurrentSettings in UrlValidator
Gitlab::CurrentSettings will create ApplicationSetting.current if not
present which means we don't have to use `&.`. We can also more easily
use stub_application_setting in specs
-rw-r--r-- | app/validators/url_validator.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/current_settings_spec.rb | 7 | ||||
-rw-r--r-- | spec/models/lfs_download_object_spec.rb | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb index d3e32818dc7..c85f5ba5cdb 100644 --- a/app/validators/url_validator.rb +++ b/app/validators/url_validator.rb @@ -93,6 +93,6 @@ class UrlValidator < ActiveModel::EachValidator end def allow_setting_local_requests? - ApplicationSetting.current&.allow_local_requests_from_hooks_and_services? + Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services? end end diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb index caf9fc5442c..97910e58676 100644 --- a/spec/lib/gitlab/current_settings_spec.rb +++ b/spec/lib/gitlab/current_settings_spec.rb @@ -14,9 +14,8 @@ describe Gitlab::CurrentSettings do describe '#current_application_settings', :use_clean_rails_memory_store_caching do it 'allows keys to be called directly' do - db_settings = create(:application_setting, - home_page_url: 'http://mydomain.com', - signup_enabled: false) + db_settings = ApplicationSetting.first || create(:application_setting) + db_settings.update!(home_page_url: 'http://mydomain.com', signup_enabled: false) expect(described_class.home_page_url).to eq(db_settings.home_page_url) expect(described_class.signup_enabled?).to be_falsey @@ -109,7 +108,7 @@ describe Gitlab::CurrentSettings do context 'with pending migrations' do before do - expect(ActiveRecord::Migrator).to receive(:needs_migration?).and_return(true) + allow(ActiveRecord::Migrator).to receive(:needs_migration?).and_return(true) end shared_examples 'a non-persisted ApplicationSetting object' do diff --git a/spec/models/lfs_download_object_spec.rb b/spec/models/lfs_download_object_spec.rb index 88838b127d2..9e78d25ad33 100644 --- a/spec/models/lfs_download_object_spec.rb +++ b/spec/models/lfs_download_object_spec.rb @@ -46,9 +46,7 @@ describe LfsDownloadObject do subject { described_class.new(oid: oid, size: size, link: 'http://192.168.1.1') } before do - allow(ApplicationSetting) - .to receive(:current) - .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_hooks_and_services: setting)) + stub_application_setting(allow_local_requests_from_hooks_and_services: setting) end context 'are allowed' do |