add engine's namespace to fixture name

1 files changed, 9 insertions, 0 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 2e1f55f2a6..a3beebbfd5 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -15,6 +15,15 @@ module TestUnit # :nodoc:
                  File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
 
+      def fixture_name
+        @fixture_name ||=
+          if defined?(ENGINE_ROOT)
+            namespaced_path + "_" + table_name
+          else
+            table_name
+          end
+      end
+
       private
 
         def attributes_hash