diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/model/model_generator.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 08c17f58f1..ea92fa04b3 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed the placement of fixture files for nested models when generating through script/generate model #7547 [jkit] + * Added TEMPLATE option to rake doc:app to set a custom output template #7737 [Jakob S] * Added VERBOSE option to rake db:migrate to turn off output #8204 [jbarnette] diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb index 9f4b15d392..2696a31656 100644 --- a/railties/lib/rails_generator/generators/components/model/model_generator.rb +++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb @@ -14,7 +14,7 @@ class ModelGenerator < Rails::Generator::NamedBase # Model class, unit test, and fixtures. m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb") m.template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb") - m.template 'fixtures.yml', File.join('test/fixtures', class_path, "#{table_name}.yml") + m.template 'fixtures.yml', File.join('test/fixtures', "#{table_name}.yml") unless options[:skip_migration] m.migration_template 'migration.rb', 'db/migrate', :assigns => { |