aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-28 07:50:42 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-28 07:50:42 +0000
commit9bafd3537554d07b96b9edf049ff48ce262c30ac (patch)
tree6b2de5a09ea32564cedddfba893284e980341c91 /railties/test
parentbc73b838e04a13531523621b11083e9a371d778c (diff)
downloadrails-9bafd3537554d07b96b9edf049ff48ce262c30ac.tar.gz
rails-9bafd3537554d07b96b9edf049ff48ce262c30ac.tar.bz2
rails-9bafd3537554d07b96b9edf049ff48ce262c30ac.zip
Fixed scaffold generator when started with only 1 parameter (closes #2609) [self@mattmower.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2780 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/rails_generator_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 00cd94596b..23d843e879 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -92,4 +92,14 @@ class RailsGeneratorTest < Test::Unit::TestCase
g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
assert_equal g.singular_name, g.table_name
end
+
+ def test_scaffold_controller_name
+ # Default behaviour is use the model name
+ g = Rails::Generator::Base.instance('scaffold', %w(Product))
+ assert_equal "Product", g.controller_name
+
+ # When we specify a controller name make sure it sticks!!
+ g = Rails::Generator::Base.instance('scaffold', %w(Product Admin))
+ assert_equal "Admin", g.controller_name
+ end
end