diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
| commit | c71120e29caddda295c133adfb279870733a3f81 (patch) | |
| tree | da81981de36bc146c36cae3bc73cb5020ba05919 /railties/test/generators/scaffold_controller_generator_test.rb | |
| parent | 087b67805e3785159cb4da524ad37782bd182b93 (diff) | |
| parent | 71d67fc6bd504956bce66e274e6228dd00a814c1 (diff) | |
| download | rails-c71120e29caddda295c133adfb279870733a3f81.tar.gz rails-c71120e29caddda295c133adfb279870733a3f81.tar.bz2 rails-c71120e29caddda295c133adfb279870733a3f81.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/test/generators/scaffold_controller_generator_test.rb')
| -rw-r--r-- | railties/test/generators/scaffold_controller_generator_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index 7593c14dd9..f971598d18 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -1,12 +1,13 @@ require 'generators/generators_test_helper' -require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' +require 'generators/rails/scaffold_controller/scaffold_controller_generator' module Unknown module Generators end end -class ScaffoldControllerGeneratorTest < GeneratorsTestCase +class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase + include GeneratorsTestHelper arguments %w(User name:string age:integer) def test_controller_skeleton_is_created |