diff options
Diffstat (limited to 'railties/test/generators/rails_scaffold_generator_test.rb')
| -rw-r--r-- | railties/test/generators/rails_scaffold_generator_test.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/railties/test/generators/rails_scaffold_generator_test.rb b/railties/test/generators/rails_scaffold_generator_test.rb index 926607f55c..70829a77fd 100644 --- a/railties/test/generators/rails_scaffold_generator_test.rb +++ b/railties/test/generators/rails_scaffold_generator_test.rb @@ -19,7 +19,7 @@ class RailsScaffoldGeneratorTest < GeneratorTestCase assert_generated_controller_for :products do |f| assert_has_method f, :index do |name, m| - assert_match /@products = Product\.find\(:all\)/, m, "#{name} should query products table" + assert_match /@products = Product\.all/, m, "#{name} should query products table" end assert_has_method f, :show, :edit, :update, :destroy do |name, m| @@ -71,7 +71,7 @@ class RailsScaffoldGeneratorTest < GeneratorTestCase assert_generated_controller_for :products do |f| assert_has_method f, :index do |name, m| - assert_match /@products = Product\.find\(:all\)/, m, "#{name} should query products table" + assert_match /@products = Product\.all/, m, "#{name} should query products table" end assert_has_method f, :show, :edit, :update, :destroy do |name, m| @@ -107,17 +107,15 @@ class RailsScaffoldGeneratorTest < GeneratorTestCase assert_added_route_for :products end - uses_mocha("scaffold_force_plural_names") do - def test_scaffolded_plural_names - Rails::Generator::Base.logger.expects(:warning) - g = Rails::Generator::Base.instance('scaffold', %w(ProductLines)) - assert_equal "ProductLines", g.controller_name - assert_equal "ProductLines", g.controller_class_name - assert_equal "ProductLine", g.controller_singular_name - assert_equal "product_lines", g.controller_plural_name - assert_equal "product_lines", g.controller_file_name - assert_equal "product_lines", g.controller_table_name - end + def test_scaffolded_plural_names + Rails::Generator::Base.logger.expects(:warning) + g = Rails::Generator::Base.instance('scaffold', %w(ProductLines)) + assert_equal "ProductLines", g.controller_name + assert_equal "ProductLines", g.controller_class_name + assert_equal "ProductLine", g.controller_singular_name + assert_equal "product_lines", g.controller_plural_name + assert_equal "product_lines", g.controller_file_name + assert_equal "product_lines", g.controller_table_name end def test_scaffold_plural_model_name_without_force_plural_generates_singular_model |