aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorBrian Cardarella <bcardarella@gmail.com>2012-06-24 17:17:06 -0400
committerBrian Cardarella <bcardarella@gmail.com>2012-06-24 17:17:06 -0400
commit35717a9370e4d0ee312aa591bc2674004cfbadba (patch)
treefc34dfbbdf3afea5b35454d768cb5974ea555de7 /actionmailer
parenta11fcd9a7681b2c064f15cc7993946e82261a8b3 (diff)
downloadrails-35717a9370e4d0ee312aa591bc2674004cfbadba.tar.gz
rails-35717a9370e4d0ee312aa591bc2674004cfbadba.tar.bz2
rails-35717a9370e4d0ee312aa591bc2674004cfbadba.zip
Some final syntax fixes
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/async.rb2
-rw-r--r--actionmailer/test/base_test.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/async.rb b/actionmailer/lib/action_mailer/async.rb
index 049d6afaea..86a5b0d035 100644
--- a/actionmailer/lib/action_mailer/async.rb
+++ b/actionmailer/lib/action_mailer/async.rb
@@ -32,7 +32,7 @@ module ActionMailer::Async
end
# Will push the message onto the Queue to be processed
- def deliver(force = false)
+ def deliver
@queue << self
end
end
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 84e5399924..144a6bfe39 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -8,7 +8,6 @@ require 'mailers/base_mailer'
require 'mailers/proc_mailer'
require 'mailers/asset_mailer'
require 'mailers/async_mailer'
-
require 'rails/queueing'
class BaseTest < ActiveSupport::TestCase
@@ -422,7 +421,7 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(1, BaseMailer.deliveries.length)
end
- def stub_queue klass, queue
+ def stub_queue(klass, queue)
Class.new(klass) {
extend Module.new {
define_method :queue do