Merge branch 'use_gitlab_current_settings' into 'master'

Use Gitlab::CurrentSettings in UrlValidator

See merge request gitlab-org/gitlab-ce!25370

2 files changed, 4 insertions, 7 deletions

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