Merge branch 'master' into nested_has_many_through

2 files changed, 10 insertions, 1 deletions

diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index 272e179fe3..064546a3f3 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -117,7 +117,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
 
   def test_missing_type_raises_exception
     assert_raise Thor::Error do
-      create_generated_attribute(:'', 'title')
+      create_generated_attribute('', 'title')
     end
   end
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 450dec7716..f4fdc46328 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -59,6 +59,15 @@ class MailerGeneratorTest < Rails::Generators::TestCase
     assert_match /haml \[not found\]/, content
   end
 
+  def test_mailer_with_namedspaced_mailer
+    run_generator ["Farm::Animal", "moos"]
+    assert_file "app/mailers/farm/animal.rb" do |mailer|
+      assert_match /class Farm::Animal < ActionMailer::Base/, mailer
+      assert_match /en\.farm\.animal\.moos\.subject/, mailer
+    end
+    assert_file "app/views/farm/animal/moos.text.erb"
+  end
+
   def test_actions_are_turned_into_methods
     run_generator