Merge branch 'master' of git://github.com/rails/rails into rails_master

4 files changed, 16 insertions, 10 deletions

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 96c84b986e..1a7ece5068 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -24,14 +24,16 @@ Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
   t.verbose = true
-  t.warning = false
+  t.warning = true
 }
 
-task :isolated_test do
-  ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-  Dir.glob("test/*_test.rb").all? do |file|
-    system(ruby, '-Ilib:test', file)
-  end or raise "Failures"
+namespace :test do
+  task :isolated do
+    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+    Dir.glob("test/*_test.rb").all? do |file|
+      system(ruby, '-Ilib:test', file)
+    end or raise "Failures"
+  end
 end
 
 # Generate the RDoc documentation
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 9876b88ecd..3639992ce9 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -480,6 +480,8 @@ module ActionMailer #:nodoc:
     # remain uninitialized (useful when you only need to invoke the "receive"
     # method, for instance).
     def initialize(method_name=nil, *parameters) #:nodoc:
+      @_response_body = nil
+      super()
       create!(method_name, *parameters) if method_name
     end
 
@@ -493,8 +495,8 @@ module ActionMailer #:nodoc:
       create_parts
 
       # Set the subject if not set yet
-      @subject ||= I18n.t(method_name, :scope => [:actionmailer, :subjects, mailer_name],
-                                       :default => method_name.humanize)
+      @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name],
+                                    :default => method_name.humanize)
 
       # build the mail object itself
       @mail = create_mail
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index fcbaa9e186..e84b3b0d23 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -4,9 +4,11 @@ begin
 rescue LoadError
   $:.unshift("#{root}/activesupport/lib")
   $:.unshift("#{root}/actionpack/lib")
-  $:.unshift("#{root}/actionmailer/lib")
 end
 
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
 require 'rubygems'
 require 'test/unit'
 
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index c49657acd7..7a47a654cd 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -415,7 +415,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
     assert_equal "Subject with i18n", ActionMailer::Base.deliveries.first.subject.decoded
 
-    I18n.backend.store_translations('en', :actionmailer => {:subjects => {:test_mailer => {:subject_with_i18n => "New Subject!"}}})
+    I18n.backend.store_translations('en', :actionmailer => {:test_mailer => {:subject_with_i18n => {:subject => "New Subject!"}}})
     assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
     assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject.decoded
   end