aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/scaffold_controller_generator_test.rb
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-01-19 19:41:15 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-01-19 19:41:15 +1100
commiteaae58ce0c79aa5b4d6de16e2e67034b7fd971bb (patch)
treed2d3fc90f977020d4e389f526f7ce494a23c3e69 /railties/test/generators/scaffold_controller_generator_test.rb
parentc5acbcbb0f72b9968decd702041dcb5b72574a28 (diff)
parentc71120e29caddda295c133adfb279870733a3f81 (diff)
downloadrails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.tar.gz
rails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.tar.bz2
rails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/test/generators/scaffold_controller_generator_test.rb')
-rw-r--r--railties/test/generators/scaffold_controller_generator_test.rb5
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