diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-03 18:25:37 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-03 18:40:22 -0800 |
| commit | 278186534c0ccf285a20497461f40d2e54aa20a0 (patch) | |
| tree | eb39e80e8e02fa6f7e04d7803efc1fccda63d3a4 /railties/test/generators | |
| parent | 34a37ea9e8265972a93f0c4f62e44308c27751dd (diff) | |
| download | rails-278186534c0ccf285a20497461f40d2e54aa20a0.tar.gz rails-278186534c0ccf285a20497461f40d2e54aa20a0.tar.bz2 rails-278186534c0ccf285a20497461f40d2e54aa20a0.zip | |
Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/rails_scaffold_generator_test.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/railties/test/generators/rails_scaffold_generator_test.rb b/railties/test/generators/rails_scaffold_generator_test.rb index 926607f55c..0155e463c7 100644 --- a/railties/test/generators/rails_scaffold_generator_test.rb +++ b/railties/test/generators/rails_scaffold_generator_test.rb @@ -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 |