diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-21 23:36:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-21 23:36:04 +0300 |
| commit | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (patch) | |
| tree | 8a788214a0286ce247670ff7694e6dff4f1d88d3 /spec | |
| parent | 7af8bb2608fddfacd54e215877780cb91cade93d (diff) | |
| parent | 649a1fcf15a239c08911040e355da112a33a2f31 (diff) | |
Merge branch '1363-redo-mailroom-support' into 'master'
Redo internals of Incoming Mail Support
See merge request !9385
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 |