diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-02-20 17:37:50 +0100 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-02-20 17:38:21 +0100 |
| commit | e49d55e96116deebcd757c5d833b679918a38127 (patch) | |
| tree | 26521a53cbad9173387ef85896b19ea2ecfdf498 /spec | |
| parent | e03a7c53aedfb8f5c9afcf71e1e2e071084b3f56 (diff) | |
| download | gitlab-ce-e49d55e96116deebcd757c5d833b679918a38127.tar.gz | |
Use newer mail_room to get `require_relative` support
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/config/mail_room_spec.rb | 4 | ||||
| -rw-r--r-- | spec/fixtures/config/mail_room_disabled.yml (renamed from spec/fixtures/mail_room_disabled.yml) | 0 | ||||
| -rw-r--r-- | spec/fixtures/config/mail_room_enabled.yml (renamed from spec/fixtures/mail_room_enabled.yml) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index 294fae95752..0b8ff006d22 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -8,7 +8,7 @@ describe 'mail_room.yml' do context 'when incoming email is disabled' do before do - ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_disabled.yml').to_s + ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/config/mail_room_disabled.yml').to_s Gitlab::MailRoom.reset_config! end @@ -26,7 +26,7 @@ describe 'mail_room.yml' do let(:gitlab_redis) { Gitlab::Redis.new(Rails.env) } before do - ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_enabled.yml').to_s + ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/config/mail_room_enabled.yml').to_s Gitlab::MailRoom.reset_config! end diff --git a/spec/fixtures/mail_room_disabled.yml b/spec/fixtures/config/mail_room_disabled.yml index 97f8cff051f..97f8cff051f 100644 --- a/spec/fixtures/mail_room_disabled.yml +++ b/spec/fixtures/config/mail_room_disabled.yml diff --git a/spec/fixtures/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml index 9c94649244d..9c94649244d 100644 --- a/spec/fixtures/mail_room_enabled.yml +++ b/spec/fixtures/config/mail_room_enabled.yml |