Merge branch 'master' of git://github.com/rails/rails

2 files changed, 33 insertions, 0 deletions

diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
new file mode 100644
index 0000000000..20f3bd8965
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -0,0 +1,15 @@
+require 'rails/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
+        template 'functional_test.rb',
+                 File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
new file mode 100644
index 0000000000..0d4185846d
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
@@ -0,0 +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