Skip to content
Browse files

Merge pull request #6141 from mhfs/mailer_tweeks

Minor ActionMailer tweaks
  • Loading branch information...
2 parents ab7b550 + 5f2f9b5 commit 54174b5f4d24115bf1d005f7073041654da27f5f @josevalim josevalim committed May 3, 2012
Showing with 2 additions and 14 deletions.
  1. +1 −1 actionmailer/lib/action_mailer/delivery_methods.rb
  2. +1 −13 actionmailer/test/abstract_unit.rb
View
2 actionmailer/lib/action_mailer/delivery_methods.rb
@@ -65,7 +65,7 @@ def wrap_delivery_behavior(mail, method=nil) #:nodoc:
when NilClass
raise "Delivery method cannot be nil"
when Symbol
- if klass = delivery_methods[method.to_sym]
+ if klass = delivery_methods[method]
mail.delivery_method(klass, send(:"#{method}_settings"))
else
raise "Invalid delivery method #{method.inspect}"
View
14 actionmailer/test/abstract_unit.rb
@@ -1,16 +1,4 @@
-# Pathname has a warning, so require it first while silencing
-# warnings to shut it up.
-#
-# Also, in 1.9, Bundler creates warnings due to overriding
-# Rubygems methods
-begin
- old, $VERBOSE = $VERBOSE, nil
- require 'pathname'
- require File.expand_path('../../../load_paths', __FILE__)
-ensure
- $VERBOSE = old
-end
-
+require File.expand_path('../../../load_paths', __FILE__)
require 'active_support/core_ext/kernel/reporting'
# These are the normal settings that will be set up by Railties

0 comments on commit 54174b5

Please sign in to comment.
Something went wrong with that request. Please try again.