aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/fixtures
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-23 13:40:19 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-23 13:40:41 +0100
commitb61f6f59805eec4f5bb873a85910c9fe00e839a9 (patch)
tree485dc3cee827ab4d79756e90d639ccc4dad464e1 /railties/test/fixtures
parentb144b56d8288246f0de7437d10361a0f1ed2bd83 (diff)
downloadrails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.tar.gz
rails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.tar.bz2
rails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.zip
Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.
Diffstat (limited to 'railties/test/fixtures')
-rw-r--r--railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb2
-rw-r--r--railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb (renamed from railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
index 7a4edb8bcb..a7d079a1bc 100644
--- a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
+++ b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
diff --git a/railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb
index d1de8c56fa..d1de8c56fa 100644
--- a/railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb
+++ b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb