Fix regression introduced in 8b50f89. Generated views mentioned the w…

…rong path.
rails · Mar 21, 2010 · 4941655 · 4941655
1 parent b7adec3
commit 4941655
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/generators/erb/controller/controller_generator.rb
@@ -10,8 +10,9 @@ def copy_view_files
         empty_directory base_path
 
         actions.each do |action|
-          @action, @path = action, File.join(base_path, action)
-          template filename_with_extensions(:view), filename_with_extensions(@path)
+          @action = action
+          @path = filename_with_extensions(File.join(base_path, action))
+          template filename_with_extensions(:view), @path
         end
       end
     end

diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
@@ -49,8 +49,8 @@ def test_does_not_invoke_test_framework_if_required
 
   def test_invokes_default_template_engine
     run_generator
-    assert_file "app/views/account/foo.html.erb", /app\/views\/account\/foo/
-    assert_file "app/views/account/bar.html.erb", /app\/views\/account\/bar/
+    assert_file "app/views/account/foo.html.erb", %r(app/views/account/foo\.html\.erb)
+    assert_file "app/views/account/bar.html.erb", %r(app/views/account/bar\.html\.erb)
   end
 
   def test_add_routes