diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 15:25:54 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:46:29 +0200 |
| commit | 6a67148ed3543ee5073ab49dc4e825f3d87cc8b5 (patch) | |
| tree | cacf11c4f156dbcf0cc4536ef68be8943b80455f /spec/db | |
| parent | c86e1437eb415e816dcc29f0b1acafeed2dcc266 (diff) | |
| download | gitlab-ce-6a67148ed3543ee5073ab49dc4e825f3d87cc8b5.tar.gz | |
Make production settings fixture use Gitlab::CurrentSettings.current_application_settings
small code formatting changes
Diffstat (limited to 'spec/db')
| -rw-r--r-- | spec/db/production/settings_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/db/production/settings_spec.rb b/spec/db/production/settings_spec.rb index c6b772f4e93..00c631b866e 100644 --- a/spec/db/production/settings_spec.rb +++ b/spec/db/production/settings_spec.rb @@ -3,8 +3,8 @@ require 'rainbow/ext/string' describe 'seed production settings', lib: true do include StubENV - let(:settings_file) { File.join(__dir__, '../../../db/fixtures/production/010_settings.rb') } - let(:settings) { ApplicationSetting.current || ApplicationSetting.create_from_defaults } + let(:settings_file) { Rails.root.join('db/fixtures/production/010_settings.rb') } + let(:settings) { Gitlab::CurrentSettings.current_application_settings } context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do before do |