aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-11-20 12:16:01 -0200
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-11-23 09:08:48 -0800
commitd0aa0cfbd76a919e536e76d65419930fb7fe31da (patch)
tree2de342c2ae28fa4c406a56a51a2ed8f80c5b7e7f /railties
parentd6f10126eb12e08ad670f803d237b942ebae5018 (diff)
downloadrails-d0aa0cfbd76a919e536e76d65419930fb7fe31da.tar.gz
rails-d0aa0cfbd76a919e536e76d65419930fb7fe31da.tar.bz2
rails-d0aa0cfbd76a919e536e76d65419930fb7fe31da.zip
Ensure generator fallbacks work even when a context is given.
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators.rb2
-rw-r--r--railties/test/generators_test.rb7
2 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 9f274b9edc..85c2fd52a4 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -198,7 +198,7 @@ module Rails
return klass if klass
end
- invoke_fallbacks_for(name, base)
+ invoke_fallbacks_for(name, base) || invoke_fallbacks_for(context, name)
end
# Receives a namespace, arguments and the behavior to invoke the generator.
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index a8716d9992..4b7b80c7f5 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -150,6 +150,13 @@ class GeneratorsTest < GeneratorsTestCase
assert_equal "test_unit:generators:plugin", klass.namespace
end
+ def test_fallbacks_for_generators_on_find_by_namespace_with_context
+ Rails::Generators.fallbacks[:remarkable] = :test_unit
+ klass = Rails::Generators.find_by_namespace(:remarkable, :rails, :plugin)
+ assert klass
+ assert_equal "test_unit:generators:plugin", klass.namespace
+ end
+
def test_fallbacks_for_generators_on_invoke
Rails::Generators.fallbacks[:shoulda] = :test_unit
TestUnit::Generators::ModelGenerator.expects(:start).with(["Account"], {})