diff options
| -rw-r--r-- | actionmailer/lib/generators/mailer/USAGE (renamed from railties/lib/rails/generators/rails/mailer/USAGE) | 0 | ||||
| -rw-r--r-- | actionmailer/lib/generators/mailer/templates/mailer.rb (renamed from railties/lib/rails/generators/rails/mailer/templates/mailer.rb) | 0 | ||||
| -rw-r--r-- | actionmailer/lib/generators/mailer_generator.rb (renamed from railties/lib/rails/generators/rails/mailer/mailer_generator.rb) | 4 | ||||
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/mailer/USAGE b/actionmailer/lib/generators/mailer/USAGE index a08d459739..a08d459739 100644 --- a/railties/lib/rails/generators/rails/mailer/USAGE +++ b/actionmailer/lib/generators/mailer/USAGE diff --git a/railties/lib/rails/generators/rails/mailer/templates/mailer.rb b/actionmailer/lib/generators/mailer/templates/mailer.rb index 7343eb28b3..7343eb28b3 100644 --- a/railties/lib/rails/generators/rails/mailer/templates/mailer.rb +++ b/actionmailer/lib/generators/mailer/templates/mailer.rb diff --git a/railties/lib/rails/generators/rails/mailer/mailer_generator.rb b/actionmailer/lib/generators/mailer_generator.rb index 8993181d79..d3048c3168 100644 --- a/railties/lib/rails/generators/rails/mailer/mailer_generator.rb +++ b/actionmailer/lib/generators/mailer_generator.rb @@ -4,6 +4,10 @@ module Rails argument :actions, :type => :array, :default => [], :banner => "method method" check_class_collision + def self.source_root + File.expand_path("../mailer/templates", __FILE__) + end + def create_mailer_file template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb") end diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index 438c976b35..8a8143e00e 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -10,4 +10,4 @@ require 'rubygems' if ARGV.include?("--dev") require 'rails/generators' require 'rails/generators/rails/app/app_generator' -Rails::Generators::AppGenerator.start
\ No newline at end of file +Rails::Generators::AppGenerator.start diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 81d6afa221..298c45b6ac 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -1,5 +1,6 @@ require 'generators/generators_test_helper' -require 'rails/generators/rails/mailer/mailer_generator' +require 'generators/mailer_generator' + class MailerGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper |