diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-15 18:36:20 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-03-15 18:36:20 -0600 |
| commit | 353d3da44c912fcd570920c8c465d98885b08b69 (patch) | |
| tree | 8f5fdd31ba2f2ee0f73be07ae3df5757f6d1fb1a /spec/config | |
| parent | e5ac06447e87c43e198ba5c557d3201f522cfca0 (diff) | |
| download | gitlab-ce-353d3da44c912fcd570920c8c465d98885b08b69.tar.gz | |
Fix redis spec
Diffstat (limited to 'spec/config')
| -rw-r--r-- | spec/config/mail_room_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index d2409a56a49..092048a6259 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe 'mail_room.yml' do + include StubENV + let(:mailroom_config_path) { 'config/mail_room.yml' } let(:gitlab_config_path) { 'config/mail_room.yml' } let(:redis_config_path) { 'config/resque.yml' } @@ -19,12 +21,11 @@ describe 'mail_room.yml' do end before(:each) do - ENV['GITLAB_REDIS_CONFIG_FILE'] = absolute_path(redis_config_path) + stub_env('GITLAB_REDIS_CONFIG_FILE', absolute_path(redis_config_path)) clear_redis_raw_config end after(:each) do - ENV['GITLAB_REDIS_CONFIG_FILE'] = nil clear_redis_raw_config end |