aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-27 21:26:53 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-27 21:30:00 +0200
commitc03585aa8da175888ad0893ef29d887f87fb749b (patch)
tree0c9c0e1a0667b90bda642c2e854c01713b5d5b18 /railties/test/generators
parentfdeee65c9624fa1490aaee829468af3b015fe956 (diff)
downloadrails-c03585aa8da175888ad0893ef29d887f87fb749b.tar.gz
rails-c03585aa8da175888ad0893ef29d887f87fb749b.tar.bz2
rails-c03585aa8da175888ad0893ef29d887f87fb749b.zip
Show invoked generators options on meta generators.
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/controller_generator_test.rb5
-rw-r--r--railties/test/generators/model_generator_test.rb6
2 files changed, 11 insertions, 0 deletions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index d0c963a9ac..6ef0e1cb3d 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -10,6 +10,11 @@ ObjectController = Class.new
class ControllerGeneratorTest < GeneratorsTestCase
+ def test_help_does_not_show_invoked_generators_options_if_they_already_exist
+ content = run_generator ["--help"]
+ assert_no_match /Helper options:/, content
+ end
+
def test_controller_skeleton_is_created
run_generator
assert_file "app/controllers/account_controller.rb", /class AccountController < ApplicationController/
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 62ad1d9305..8a9c081cd9 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -6,6 +6,12 @@ require 'generators/test_unit/model/model_generator'
class ModelGeneratorTest < GeneratorsTestCase
+ def test_help_shows_invoked_generators_options
+ content = run_generator ["--help"]
+ assert_match /ActiveRecord options:/, content
+ assert_match /TestUnit options:/, content
+ end
+
def test_invokes_default_orm
run_generator
assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/