diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:46 +0300 |
| commit | 7f305b576b51c3503970ef224cf4b31e247a322d (patch) | |
| tree | 9a3b0ddfb8640fd1a66307a38fe6ba264e5d99dd /spec/initializers | |
| parent | 04edf6545802ed0515e221038b63fc96ad3e6d54 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers')
| -rw-r--r-- | spec/initializers/action_mailer_hooks_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/initializers/action_mailer_hooks_spec.rb b/spec/initializers/action_mailer_hooks_spec.rb index 20f96f7e16c..03eee09f737 100644 --- a/spec/initializers/action_mailer_hooks_spec.rb +++ b/spec/initializers/action_mailer_hooks_spec.rb @@ -6,6 +6,10 @@ describe 'ActionMailer hooks' do describe 'smime signature interceptor' do before do class_spy(ActionMailer::Base).as_stubbed_const + + # rspec-rails calls ActionMailer::Base.deliveries.clear after every test + # https://github.com/rspec/rspec-rails/commit/71c12388e2bad78aaeea6443a393ede78341a7a3 + allow(ActionMailer::Base).to receive_message_chain(:deliveries, :clear) end it 'is disabled by default' do |