Extract a attributes_names method to avoid duplication

1 files changed, 4 insertions, 12 deletions

diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 08bf50dfe2..8f3ecaadea 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -18,19 +18,11 @@ module TestUnit # :nodoc:
       private
 
         def attributes_hash
-          return if attributes.empty?
+          return if attributes_names.empty?
 
-          hash_values = []
-          attributes.each do |a|
-            hash_values << hash_value(a.reference? ? "#{a.name}_id" : a.name)
-            hash_values << hash_value("#{a.name}_type") if a.polymorphic?
-          end
-
-          hash_values.sort.join(', ')
-        end
-
-        def hash_value(name)
-          "#{name}: @#{singular_table_name}.#{name}"
+          attributes_names.map do |name|
+            "#{name}: @#{singular_table_name}.#{name}"
+          end.sort.join(', ')
         end
     end
   end