aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:32:41 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:32:41 -0800
commitada895e8cac855a2f248aafdb92457365f062d07 (patch)
treed3981be951783a72551a440b626ecd70cf7a1bf1 /railties/test
parent671538cd6ea0bd4c463e7bf7d238a55924a8af53 (diff)
parentf8d06e62a9084e0c862128bd9fcbb053676a007e (diff)
downloadrails-ada895e8cac855a2f248aafdb92457365f062d07.tar.gz
rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.bz2
rails-ada895e8cac855a2f248aafdb92457365f062d07.zip
Merge branch 'master' into mail
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb (renamed from railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb)0
-rw-r--r--railties/test/generators_test.rb7
2 files changed, 7 insertions, 0 deletions
diff --git a/railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb b/railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb
index 191bdbf2fc..191bdbf2fc 100644
--- a/railties/test/fixtures/vendor/plugins/mspec/lib/generators/mspec_generator.rb
+++ b/railties/test/fixtures/vendor/plugins/mspec/lib/rails_generators/mspec_generator.rb
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"], {})