aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/actions_test.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-11-02 17:12:01 -0800
committerYehuda Katz <wycats@gmail.com>2009-11-02 17:12:01 -0800
commit14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (patch)
tree431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /railties/test/generators/actions_test.rb
parent976c2647240fd40a2b706ab5e41856cd47e7b212 (diff)
downloadrails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.gz
rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.tar.bz2
rails-14370e1aab6ddfb5b86cf50bd7e5abcebae0684c.zip
CI breakage
This reverts commit a288b74f1c75c6f100de7611a5093a421f1ad6d1.
Diffstat (limited to 'railties/test/generators/actions_test.rb')
-rw-r--r--railties/test/generators/actions_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index f5cb26cf52..199b5fa8b4 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -182,7 +182,7 @@ class ActionsTest < GeneratorsTestCase
end
def generator(config={})
- @generator ||= Rails::Generators::Base.new([], {}, config)
+ @generator ||= Rails::Generators::Base.new([], {}, { :destination_root => destination_root }.merge!(config))
end
def action(*args, &block)