2 files changed, 15 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb
index c1dd535dd3..2801749ffe 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -1,15 +1,15 @@
 require 'rails/generators/test_unit'
 
-module TestUnit
-  module Generators
-    class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :fixture, :type => :boolean
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ModelGenerator < Base # :nodoc:
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      class_option :fixture, type: :boolean
 
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_file
-        template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 5c8780aa64..7625ff975c 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -3,12 +3,18 @@
 <% unless attributes.empty? -%>
 one:
 <% attributes.each do |attribute| -%>
-  <%= attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
+  <%- if attribute.polymorphic? -%>
+  <%= "#{attribute.name}_type: #{attribute.human_name}" %>
+  <%- end -%>
 <% end -%>
 
 two:
 <% attributes.each do |attribute| -%>
-  <%= attribute.name %>: <%= attribute.default %>
+  <%= attribute.column_name %>: <%= attribute.default %>
+  <%- if attribute.polymorphic? -%>
+  <%= "#{attribute.name}_type: #{attribute.human_name}" %>
+  <%- end -%>
 <% end -%>
 <% else -%>
 # This model initially had no columns defined.  If you add columns to the