2 files changed, 11 insertions, 0 deletions
diff --git a/railties/lib/generators/test_unit/controller/controller_generator.rb b/railties/lib/generators/test_unit/controller/controller_generator.rb
index b57a6e794f..847d482335 100644
--- a/railties/lib/generators/test_unit/controller/controller_generator.rb
+++ b/railties/lib/generators/test_unit/controller/controller_generator.rb
@@ -3,6 +3,7 @@ require 'generators/test_unit'
 module TestUnit
   module Generators
     class ControllerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "action action"
       check_class_collision :suffix => "ControllerTest"
 
       def create_test_files
diff --git a/railties/lib/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/generators/test_unit/controller/templates/functional_test.rb
index 62fa5d86fd..0d4185846d 100644
--- a/railties/lib/generators/test_unit/controller/templates/functional_test.rb
+++ b/railties/lib/generators/test_unit/controller/templates/functional_test.rb
@@ -1,8 +1,18 @@
 require 'test_helper'
 
 class <%= class_name %>ControllerTest < ActionController::TestCase
+<% if actions.empty? -%>
   # Replace this with your real tests.
   test "the truth" do
     assert true
   end
+<% else -%>
+<% for action in actions -%>
+  test "should get <%= action %>" do
+    get :<%= action %>
+    assert_response :success
+  end
+
+<% end -%>
+<% end -%>
 end