aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/base_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-21 15:42:47 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-21 16:29:47 -0800
commitf9da785d0b1b22317cfca25c15fb555e9016accb (patch)
treef54e2174e9388ebb51bc32ed9ba1aa7cc7d95a32 /actionmailer/test/base_test.rb
parent10c0a3bd113c41f44fc025d2d042da95e9d8ea1f (diff)
downloadrails-f9da785d0b1b22317cfca25c15fb555e9016accb.tar.gz
rails-f9da785d0b1b22317cfca25c15fb555e9016accb.tar.bz2
rails-f9da785d0b1b22317cfca25c15fb555e9016accb.zip
Move background jobs to the 'jobs' branch until fully baked. Not shipping with Rails 4.0.
Diffstat (limited to 'actionmailer/test/base_test.rb')
-rw-r--r--actionmailer/test/base_test.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 170923673b..b06c465380 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -3,13 +3,11 @@ require 'abstract_unit'
require 'set'
require 'action_dispatch'
-require 'active_support/queueing'
require 'active_support/time'
require 'mailers/base_mailer'
require 'mailers/proc_mailer'
require 'mailers/asset_mailer'
-require 'mailers/async_mailer'
class BaseTest < ActiveSupport::TestCase
def teardown
@@ -422,17 +420,6 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(1, BaseMailer.deliveries.length)
end
- test "delivering message asynchronously" do
- AsyncMailer.delivery_method = :test
- AsyncMailer.deliveries.clear
-
- AsyncMailer.welcome.deliver
- assert_equal 0, AsyncMailer.deliveries.length
-
- AsyncMailer.queue.drain
- assert_equal 1, AsyncMailer.deliveries.length
- end
-
test "calling deliver, ActionMailer should yield back to mail to let it call :do_delivery on itself" do
mail = Mail::Message.new
mail.expects(:do_delivery).once