Merge remote branch 'rails/master'

3 files changed, 13 insertions, 16 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 609b815683..c1dd535dd3 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -16,7 +16,7 @@ module TestUnit
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template 'fixtures.yml', File.join('test/fixtures', "#{table_name}.yml")
+          template 'fixtures.yml', File.join('test/fixtures', class_path, "#{plural_file_name}.yml")
         end
       end
     end
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 c0315c7fe6..f7e907a017 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -6,7 +6,6 @@ module TestUnit
     class ScaffoldGenerator < Base
       include Rails::Generators::ResourceHelpers
 
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
       check_class_collision :suffix => "ControllerTest"
 
       def create_test_files
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index d5d3d6d5cd..f23e495450 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -2,48 +2,46 @@ require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   setup do
-    @<%= file_name %> = <%= table_name %>(:one)
+    @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 
-<% unless options[:singleton] -%>
   test "should get index" do
     get :index
     assert_response :success
     assert_not_nil assigns(:<%= table_name %>)
   end
-<% end -%>
 
   test "should get new" do
     get :new
     assert_response :success
   end
 
-  test "should create <%= file_name %>" do
+  test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, :<%= file_name %> => @<%= file_name %>.attributes
+      post :create, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
     end
 
-    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  test "should show <%= file_name %>" do
-    get :show, :id => @<%= file_name %>.to_param
+  test "should show <%= singular_table_name %>" do
+    get :show, :id => @<%= singular_table_name %>.to_param
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, :id => @<%= file_name %>.to_param
+    get :edit, :id => @<%= singular_table_name %>.to_param
     assert_response :success
   end
 
-  test "should update <%= file_name %>" do
-    put :update, :id => @<%= file_name %>.to_param, :<%= file_name %> => @<%= file_name %>.attributes
-    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+  test "should update <%= singular_table_name %>" do
+    put :update, :id => @<%= singular_table_name %>.to_param, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  test "should destroy <%= file_name %>" do
+  test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, :id => @<%= file_name %>.to_param
+      delete :destroy, :id => @<%= singular_table_name %>.to_param
     end
 
     assert_redirected_to <%= index_helper %>_path