aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails/mailer
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/generators/rails/mailer')
-rw-r--r--railties/lib/generators/rails/mailer/USAGE4
-rw-r--r--railties/lib/generators/rails/mailer/mailer_generator.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/generators/rails/mailer/USAGE b/railties/lib/generators/rails/mailer/USAGE
index c56095b2c8..4b0b8ddc3b 100644
--- a/railties/lib/generators/rails/mailer/USAGE
+++ b/railties/lib/generators/rails/mailer/USAGE
@@ -9,7 +9,7 @@ Example:
`./script/generate mailer Notifications signup forgot_password invoice`
creates a Notifications mailer class, views, test, and fixtures:
- Mailer: app/models/notifications.rb
+ Mailer: app/mailers/notifications.rb
Views: app/views/notifications/signup.erb [...]
- Test: test/unit/test/unit/notifications_test.rb
+ Test: test/functional/notifications_test.rb
Fixtures: test/fixtures/notifications/signup [...]
diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb
index 33f1665b83..8993181d79 100644
--- a/railties/lib/generators/rails/mailer/mailer_generator.rb
+++ b/railties/lib/generators/rails/mailer/mailer_generator.rb
@@ -5,7 +5,7 @@ module Rails
check_class_collision
def create_mailer_file
- template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb")
+ template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb")
end
hook_for :template_engine, :test_framework