From 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 2 Nov 2009 17:12:01 -0800 Subject: CI breakage This reverts commit a288b74f1c75c6f100de7611a5093a421f1ad6d1. --- railties/test/generators/scaffold_generator_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/test/generators/scaffold_generator_test.rb') diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 09ab58e404..c0652c034f 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -122,7 +122,8 @@ class ScaffoldGeneratorTest < GeneratorsTestCase def run_generator(config={}) silence(:stdout) do - Rails::Generators::ScaffoldGenerator.start ["product_line", "title:string", "price:integer"], config + Rails::Generators::ScaffoldGenerator.start ["product_line", "title:string", "price:integer"], + config.merge(:destination_root => destination_root) end end -- cgit v1.2.3