aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/scaffold_generator_test.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-19 13:40:26 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-19 13:40:26 +0530
commitc71120e29caddda295c133adfb279870733a3f81 (patch)
treeda81981de36bc146c36cae3bc73cb5020ba05919 /railties/test/generators/scaffold_generator_test.rb
parent087b67805e3785159cb4da524ad37782bd182b93 (diff)
parent71d67fc6bd504956bce66e274e6228dd00a814c1 (diff)
downloadrails-c71120e29caddda295c133adfb279870733a3f81.tar.gz
rails-c71120e29caddda295c133adfb279870733a3f81.tar.bz2
rails-c71120e29caddda295c133adfb279870733a3f81.zip
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/test/generators/scaffold_generator_test.rb')
-rw-r--r--railties/test/generators/scaffold_generator_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 4ddc7b1c89..a7e9c8a231 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -1,7 +1,8 @@
require 'generators/generators_test_helper'
-require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'generators/rails/scaffold/scaffold_generator'
-class ScaffoldGeneratorTest < GeneratorsTestCase
+class ScaffoldGeneratorTest < Rails::Generators::TestCase
+ include GeneratorsTestHelper
arguments %w(product_line title:string price:integer)
def setup