github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1461 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-06-21 06:54:04 +00:00
parent bc6570dfcb
commit b69199c1da
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]
* Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 [Michael Koziarski]
* Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar]

4
railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
View File

@@ -8,7 +8,7 @@ class MailerGenerator < Rails::Generator::NamedBase
m.directory File.join('app/models', class_path)
m.directory File.join('app/views', class_path, file_name)
m.directory File.join('test/unit', class_path)
m.directory File.join('test/fixtures', class_path, table_name)
m.directory File.join('test/fixtures', class_path, file_name)
# Mailer class and unit test.
m.template "mailer.rb", File.join('app/models',
@@ -24,7 +24,7 @@ class MailerGenerator < Rails::Generator::NamedBase
File.join('app/views', class_path, file_name, "#{action}.rhtml"),
:assigns => { :action => action }
m.template "fixture.rhtml",
File.join('test/fixtures', class_path, table_name, action),
File.join('test/fixtures', class_path, file_name, action),
:assigns => { :action => action }
end
end