aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-26 12:23:02 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-26 12:23:02 +0100
commite6da2f651ffc24e5be3842051df73493d158a6b4 (patch)
tree813c511528a6c08691d33d0a269f771e73e6d351 /railties
parent007c0bb3b0e678f685fb82c1eb6c20e73f601b16 (diff)
downloadrails-e6da2f651ffc24e5be3842051df73493d158a6b4.tar.gz
rails-e6da2f651ffc24e5be3842051df73493d158a6b4.tar.bz2
rails-e6da2f651ffc24e5be3842051df73493d158a6b4.zip
Ensure app does not show up in generators.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators.rb1
-rw-r--r--railties/test/generators_test.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 83b8c74966..2281746b00 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -200,6 +200,7 @@ module Rails
# Print Rails defaults first.
rails = groups.delete("rails")
rails.map! { |n| n.sub(/^rails:/, '') }
+ rails.delete("app")
print_list("rails", rails)
groups.sort.each { |b, n| print_list(b, n) }
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index f37b684f73..33cc27bd84 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -99,6 +99,7 @@ class GeneratorsTest < Rails::Generators::TestCase
assert_match /Rails:/, output
assert_match /^ model$/, output
assert_match /^ scaffold_controller$/, output
+ assert_no_match /^ app$/, output
end
def test_rails_generators_with_others_information