Merge commit 'mainstream/master'

Conflicts:
	railties/guides/source/active_support_overview.textile

1 files changed, 52 insertions, 0 deletions

diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
new file mode 100644
index 0000000000..9e74859c3a
--- /dev/null
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -0,0 +1,52 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'generators/rails/mailer/mailer_generator'
+
+class MailerGeneratorTest < GeneratorsTestCase
+
+  def test_mailer_skeleton_is_created
+    run_generator
+    assert_file "app/models/notifier.rb", /class Notifier < ActionMailer::Base/
+  end
+
+  def test_check_class_collision
+    content = capture(:stderr){ run_generator ["object"] }
+    assert_match /The name 'Object' is either already used in your application or reserved/, content
+  end
+
+  def test_invokes_default_test_framework
+    run_generator
+    assert_file "test/unit/notifier_test.rb", /class NotifierTest < ActionMailer::TestCase/
+    assert_file "test/fixtures/notifier/foo", /app\/views\/notifier\/foo/
+    assert_file "test/fixtures/notifier/bar", /app\/views\/notifier\/bar/
+  end
+
+  def test_invokes_default_template_engine
+    run_generator
+    assert_file "app/views/notifier/foo.erb", /app\/views\/notifier\/foo/
+    assert_file "app/views/notifier/bar.erb", /app\/views\/notifier\/bar/
+  end
+
+  def test_invokes_default_template_engine_even_with_no_action
+    run_generator ["notifier"]
+    assert_file "app/views/notifier"
+  end
+
+  def test_logs_if_the_template_engine_cannot_be_found
+    content = run_generator ["notifier", "foo", "bar", "--template-engine=haml"]
+    assert_match /haml \[not found\]/, content
+  end
+
+  def test_actions_are_turned_into_methods
+    run_generator
+    assert_file "app/models/notifier.rb", /def foo/
+    assert_file "app/models/notifier.rb", /def bar/
+  end
+
+  protected
+
+    def run_generator(args=["notifier", "foo", "bar"])
+      silence(:stdout) { Rails::Generators::MailerGenerator.start args, :destination_root => destination_root }
+    end
+
+end