Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 21 insertions, 0 deletions

diff --git a/railties/lib/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/generators/test_unit/mailer/mailer_generator.rb
new file mode 100644
index 0000000000..ef350a6224
--- /dev/null
+++ b/railties/lib/generators/test_unit/mailer/mailer_generator.rb
@@ -0,0 +1,21 @@
+require 'generators/test_unit'
+
+module TestUnit
+  module Generators
+    class MailerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "method method"
+      check_class_collision :suffix => "Test"
+
+      def create_test_files
+        template "unit_test.rb", File.join('test/unit', class_path, "#{file_name}_test.rb")
+      end
+
+      def create_fixtures_files
+        actions.each do |action|
+          @action, @path = action, File.join(file_path, action)
+          template "fixture", File.join("test/fixtures", @path)
+        end
+      end
+    end
+  end
+end