diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-11-02 17:12:01 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-11-02 17:12:01 -0800 |
commit | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (patch) | |
tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /railties/test/generators/resource_generator_test.rb | |
parent | 976c2647240fd40a2b706ab5e41856cd47e7b212 (diff) | |
download | rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.gz rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.bz2 rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.zip |
CI breakage
This reverts commit a288b74f1c75c6f100de7611a5093a421f1ad6d1.
Diffstat (limited to 'railties/test/generators/resource_generator_test.rb')
-rw-r--r-- | railties/test/generators/resource_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb index 99811bc07b..dcae81c204 100644 --- a/railties/test/generators/resource_generator_test.rb +++ b/railties/test/generators/resource_generator_test.rb @@ -100,7 +100,7 @@ class ResourceGeneratorTest < GeneratorsTestCase protected def run_generator(args=["account"], config={}) - silence(:stdout) { Rails::Generators::ResourceGenerator.start args, config } + silence(:stdout) { Rails::Generators::ResourceGenerator.start args, config.merge(:destination_root => destination_root) } end end |