aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-14 22:30:01 +0100
committerJosé Valim <jose.valim@gmail.com>2012-03-14 22:30:01 +0100
commit6db930cb5bbff9ad824590b5844e04768de240b1 (patch)
tree2bc3a70028087aed19b398da96de97a53762f43d /railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
parent1efeb072bf39c3eeef9a0d8874e58a4bd9850db6 (diff)
downloadrails-6db930cb5bbff9ad824590b5844e04768de240b1.tar.gz
rails-6db930cb5bbff9ad824590b5844e04768de240b1.tar.bz2
rails-6db930cb5bbff9ad824590b5844e04768de240b1.zip
Remove --http.
Diffstat (limited to 'railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb')
-rw-r--r--railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb6
1 files changed, 2 insertions, 4 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