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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1461 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -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]

railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb

@@ -8,7 +8,7 @@ def manifest
       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 @@ def manifest
                    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