2 files changed, 2 insertions, 54 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 e875c81340..9e76587a0d 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -14,10 +14,8 @@ module TestUnit
                           :desc => "Generate functional test with HTTP actions only"
 
       def create_test_files
-        template_file = options.http? ? "http_functional_test.rb" : "functional_test.rb"
-
-        template template_file,
-                 File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
+        template "functional_test.rb",
+                 File.join("test/functional", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
 
       private
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/http_functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/http_functional_test.rb
deleted file mode 100644
index 5bb61cb263..0000000000
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/http_functional_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'test_helper'
-
-<% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < ActionController::TestCase
-  setup do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
-    @request.accept = "application/json"
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
-      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    end
-
-    assert_response 201
-    assert_not_nil assigns(:<%= singular_table_name %>)
-  end
-
-  test "should show <%= singular_table_name %>" do
-    get :show, id: @<%= singular_table_name %>
-    assert_response :success
-  end
-
-  test "should update <%= singular_table_name %>" do
-    put :update, id: @<%= singular_table_name %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    assert_response 204
-    assert_not_nil assigns(:<%= singular_table_name %>)
-  end
-
-  test "should destroy <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, id: @<%= singular_table_name %>
-    end
-
-    assert_response 204
-    assert_not_nil assigns(:<%= singular_table_name %>)
-  end
-end
-<% end -%>