diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 12:58:05 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 12:58:05 +0000 |
commit | 7e55a227a53feaf4c8af9585a395f189402fcbc3 (patch) | |
tree | 732a42856686d58f5c54f9e32aa88539be38ee78 /spec/lib/gitlab/current_settings_spec.rb | |
parent | 61b606a803cf9c197eee3f1397562f94dd3df315 (diff) | |
download | gitlab-ce-7e55a227a53feaf4c8af9585a395f189402fcbc3.tar.gz |
Revert "Merge branch 'use_gitlab_current_settings' into 'master'"
This reverts merge request !25370
Diffstat (limited to 'spec/lib/gitlab/current_settings_spec.rb')
-rw-r--r-- | spec/lib/gitlab/current_settings_spec.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb index 97910e58676..caf9fc5442c 100644 --- a/spec/lib/gitlab/current_settings_spec.rb +++ b/spec/lib/gitlab/current_settings_spec.rb @@ -14,8 +14,9 @@ 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 = ApplicationSetting.first || create(:application_setting) - db_settings.update!(home_page_url: 'http://mydomain.com', signup_enabled: false) + db_settings = create(:application_setting, + 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 @@ -108,7 +109,7 @@ describe Gitlab::CurrentSettings do context 'with pending migrations' do before do - allow(ActiveRecord::Migrator).to receive(:needs_migration?).and_return(true) + expect(ActiveRecord::Migrator).to receive(:needs_migration?).and_return(true) end shared_examples 'a non-persisted ApplicationSetting object' do |