diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-29 10:41:35 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-29 10:41:35 -0300 |
| commit | 4606e7527b121ee1ea2e24249ad4db2faaf0c8ad (patch) | |
| tree | 3cd6a94b3b7f4eede80e057e436db5f9a9009bcc | |
| parent | cf75695dc0ebe0b71e92401217e40478545d9a20 (diff) | |
| parent | a548e2ba16db2a6be98836629b11b02e45a89936 (diff) | |
| download | rails-4606e7527b121ee1ea2e24249ad4db2faaf0c8ad.tar.gz rails-4606e7527b121ee1ea2e24249ad4db2faaf0c8ad.tar.bz2 rails-4606e7527b121ee1ea2e24249ad4db2faaf0c8ad.zip | |
Merge pull request #16741 from robin850/am-isolated-wo-bundle
Make test:isolated run without bundler for Action Mailer
| -rw-r--r-- | actionmailer/test/message_delivery_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index 8402fc130f..53654871a2 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -1,9 +1,8 @@ # encoding: utf-8 -gem 'activejob' -require 'active_job' require 'abstract_unit' +require 'active_job' require 'minitest/mock' -require_relative 'mailers/delayed_mailer' +require 'mailers/delayed_mailer' class MessageDeliveryTest < ActiveSupport::TestCase |