diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2014-08-27 19:38:04 +0200 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2014-08-29 12:41:37 +0200 |
| commit | a548e2ba16db2a6be98836629b11b02e45a89936 (patch) | |
| tree | 8795d2ee7187b0f935479511cd6288d6b900e61a /actionmailer/test/message_delivery_test.rb | |
| parent | 38d6c722b23bae2eeb82a63fc1e78c0937bed17a (diff) | |
| download | rails-a548e2ba16db2a6be98836629b11b02e45a89936.tar.gz rails-a548e2ba16db2a6be98836629b11b02e45a89936.tar.bz2 rails-a548e2ba16db2a6be98836629b11b02e45a89936.zip | |
Make test:isolated run without bundler for Action Mailer
Action Mailer tests weren't able to run in isolation without the bundle
exec prefix since we were requiring gems before requiring abstract_unit.
We don't need the `gem` call thus and the require_relative since the
test directory should be present in the load path when we run any test.
Diffstat (limited to 'actionmailer/test/message_delivery_test.rb')
| -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 |