diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 15:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 15:09:18 +0000 |
| commit | 364f6f2e33e6f5eafe63b25d9256b88e72141b1c (patch) | |
| tree | ee6dc003a354e7466d5c45e5587c0f8172312122 /spec/initializers | |
| parent | 98252e0dd60cbcb316231085e206d9872f243b8a (diff) | |
| download | gitlab-ce-364f6f2e33e6f5eafe63b25d9256b88e72141b1c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers')
| -rw-r--r-- | spec/initializers/action_mailer_hooks_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/initializers/action_mailer_hooks_spec.rb b/spec/initializers/action_mailer_hooks_spec.rb index ce6e1ed0fa2..20f96f7e16c 100644 --- a/spec/initializers/action_mailer_hooks_spec.rb +++ b/spec/initializers/action_mailer_hooks_spec.rb @@ -35,8 +35,11 @@ describe 'ActionMailer hooks' do load Rails.root.join('config/initializers/action_mailer_hooks.rb') if smime_interceptor_enabled + # Premailer must be registered before S/MIME or signatures will be mangled expect(ActionMailer::Base).to( - have_received(:register_interceptor).with(Gitlab::Email::Hook::SmimeSignatureInterceptor)) + have_received(:register_interceptor).with(::Premailer::Rails::Hook).ordered) + expect(ActionMailer::Base).to( + have_received(:register_interceptor).with(Gitlab::Email::Hook::SmimeSignatureInterceptor).ordered) else expect(ActionMailer::Base).not_to( have_received(:register_interceptor).with(Gitlab::Email::Hook::SmimeSignatureInterceptor)) |