Reorganize the mailer generator a bit.

2010-04-30 12:11:38 +02:00 · 2010-04-30 12:11:38 +02:00 · 7b98d2aa59
parent d2a49e4b1f
commit 7b98d2aa59
4 changed files with 2 additions and 2 deletions
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
--- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
+++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
@ -5,7 +5,7 @@ module Rails
      check_class_collision

      def self.source_root
-        File.expand_path("../mailer/templates", __FILE__)
+        File.expand_path("../templates", __FILE__)
      end

      def create_mailer_file
--- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@ -1,5 +1,5 @@
 require 'generators/generators_test_helper'
-require 'generators/mailer_generator'
+require 'rails/generators/mailer/mailer_generator'


 class MailerGeneratorTest < Rails::Generators::TestCase