Permalink
Browse files

Load generators from both lib/rails/generators and lib/generators. Us…

…ing the former since it's less obstrusive.
  • Loading branch information...
josevalim committed Mar 23, 2010
1 parent b144b56 commit b61f6f59805eec4f5bb873a85910c9fe00e839a9
Showing with 46 additions and 46 deletions.
  1. 0 activerecord/lib/{ → rails}/generators/active_record.rb
  2. +1 −1 activerecord/lib/{ → rails}/generators/active_record/migration/migration_generator.rb
  3. 0 activerecord/lib/{ → rails}/generators/active_record/migration/templates/migration.rb
  4. +1 −1 activerecord/lib/{ → rails}/generators/active_record/model/model_generator.rb
  5. 0 activerecord/lib/{ → rails}/generators/active_record/model/templates/migration.rb
  6. 0 activerecord/lib/{ → rails}/generators/active_record/model/templates/model.rb
  7. +1 −1 activerecord/lib/{ → rails}/generators/active_record/observer/observer_generator.rb
  8. 0 activerecord/lib/{ → rails}/generators/active_record/observer/templates/observer.rb
  9. +1 −1 ...verecord/lib/{ → rails}/generators/active_record/session_migration/session_migration_generator.rb
  10. 0 activerecord/lib/{ → rails}/generators/active_record/session_migration/templates/migration.rb
  11. +2 −2 railties/lib/rails/generators.rb
  12. +1 −1 railties/lib/rails/generators/base.rb
  13. 0 railties/lib/{ → rails}/generators/erb.rb
  14. +1 −1 railties/lib/{ → rails}/generators/erb/controller/controller_generator.rb
  15. 0 railties/lib/{ → rails}/generators/erb/controller/templates/view.html.erb
  16. +1 −1 railties/lib/{ → rails}/generators/erb/mailer/mailer_generator.rb
  17. 0 railties/lib/{ → rails}/generators/erb/mailer/templates/view.text.erb
  18. +1 −1 railties/lib/{ → rails}/generators/erb/scaffold/scaffold_generator.rb
  19. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/_form.html.erb
  20. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/edit.html.erb
  21. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/index.html.erb
  22. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/layout.html.erb
  23. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/new.html.erb
  24. 0 railties/lib/{ → rails}/generators/erb/scaffold/templates/show.html.erb
  25. 0 railties/lib/{ → rails}/generators/rails/app/USAGE
  26. +1 −1 railties/lib/{ → rails}/generators/rails/app/app_generator.rb
  27. 0 railties/lib/{ → rails}/generators/rails/app/templates/Gemfile
  28. 0 railties/lib/{ → rails}/generators/rails/app/templates/README
  29. 0 railties/lib/{ → rails}/generators/rails/app/templates/Rakefile
  30. 0 railties/lib/{ → rails}/generators/rails/app/templates/app/controllers/application_controller.rb
  31. 0 railties/lib/{ → rails}/generators/rails/app/templates/app/helpers/application_helper.rb
  32. 0 railties/lib/{ → rails}/generators/rails/app/templates/app/models/.empty_directory
  33. 0 railties/lib/{ → rails}/generators/rails/app/templates/app/views/layouts/.empty_directory
  34. 0 railties/lib/{ → rails}/generators/rails/app/templates/config.ru
  35. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/application.rb
  36. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/boot.rb
  37. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/frontbase.yml
  38. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/ibm_db.yml
  39. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/mysql.yml
  40. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/oracle.yml
  41. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/postgresql.yml
  42. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/databases/sqlite3.yml
  43. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/environment.rb
  44. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/environments/development.rb.tt
  45. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/environments/production.rb.tt
  46. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/environments/test.rb.tt
  47. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
  48. 0 ...ib/{ → rails}/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt
  49. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/inflections.rb
  50. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/mime_types.rb
  51. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/session_store.rb.tt
  52. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/locales/en.yml
  53. 0 railties/lib/{ → rails}/generators/rails/app/templates/config/routes.rb
  54. 0 railties/lib/{ → rails}/generators/rails/app/templates/db/seeds.rb
  55. 0 railties/lib/{ → rails}/generators/rails/app/templates/doc/README_FOR_APP
  56. 0 railties/lib/{ → rails}/generators/rails/app/templates/gitignore
  57. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/404.html
  58. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/422.html
  59. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/500.html
  60. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/favicon.ico
  61. BIN railties/lib/{ → rails}/generators/rails/app/templates/public/images/rails.png
  62. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/index.html
  63. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/application.js
  64. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/controls.js
  65. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/dragdrop.js
  66. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/effects.js
  67. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/prototype.js
  68. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/rails.js
  69. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/robots.txt
  70. 0 railties/lib/{ → rails}/generators/rails/app/templates/public/stylesheets/.empty_directory
  71. 0 railties/lib/{ → rails}/generators/rails/app/templates/script/rails
  72. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/fixtures/.empty_directory
  73. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/functional/.empty_directory
  74. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/integration/.empty_directory
  75. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/performance/browsing_test.rb
  76. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/test_helper.rb
  77. 0 railties/lib/{ → rails}/generators/rails/app/templates/test/unit/.empty_directory
  78. 0 railties/lib/{ → rails}/generators/rails/controller/USAGE
  79. 0 railties/lib/{ → rails}/generators/rails/controller/controller_generator.rb
  80. 0 railties/lib/{ → rails}/generators/rails/controller/templates/controller.rb
  81. 0 railties/lib/{ → rails}/generators/rails/generator/USAGE
  82. 0 railties/lib/{ → rails}/generators/rails/generator/generator_generator.rb
  83. 0 railties/lib/{ → rails}/generators/rails/generator/templates/%file_name%_generator.rb.tt
  84. 0 railties/lib/{ → rails}/generators/rails/generator/templates/USAGE.tt
  85. 0 railties/lib/{ → rails}/generators/rails/generator/templates/templates/.empty_directory
  86. 0 railties/lib/{ → rails}/generators/rails/helper/USAGE
  87. 0 railties/lib/{ → rails}/generators/rails/helper/helper_generator.rb
  88. 0 railties/lib/{ → rails}/generators/rails/helper/templates/helper.rb
  89. 0 railties/lib/{ → rails}/generators/rails/integration_test/USAGE
  90. 0 railties/lib/{ → rails}/generators/rails/integration_test/integration_test_generator.rb
  91. 0 railties/lib/{ → rails}/generators/rails/mailer/USAGE
  92. 0 railties/lib/{ → rails}/generators/rails/mailer/mailer_generator.rb
  93. 0 railties/lib/{ → rails}/generators/rails/mailer/templates/mailer.rb
  94. 0 railties/lib/{ → rails}/generators/rails/metal/USAGE
  95. 0 railties/lib/{ → rails}/generators/rails/metal/metal_generator.rb
  96. 0 railties/lib/{ → rails}/generators/rails/metal/templates/metal.rb
  97. 0 railties/lib/{ → rails}/generators/rails/migration/USAGE
  98. 0 railties/lib/{ → rails}/generators/rails/migration/migration_generator.rb
  99. 0 railties/lib/{ → rails}/generators/rails/model/USAGE
  100. 0 railties/lib/{ → rails}/generators/rails/model/model_generator.rb
  101. 0 railties/lib/{ → rails}/generators/rails/model_subclass/model_subclass_generator.rb
  102. 0 railties/lib/{ → rails}/generators/rails/observer/USAGE
  103. 0 railties/lib/{ → rails}/generators/rails/observer/observer_generator.rb
  104. 0 railties/lib/{ → rails}/generators/rails/performance_test/USAGE
  105. 0 railties/lib/{ → rails}/generators/rails/performance_test/performance_test_generator.rb
  106. 0 railties/lib/{ → rails}/generators/rails/plugin/USAGE
  107. +1 −1 railties/lib/{ → rails}/generators/rails/plugin/plugin_generator.rb
  108. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/MIT-LICENSE.tt
  109. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/README.tt
  110. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/Rakefile.tt
  111. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/init.rb
  112. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/install.rb
  113. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/lib/%file_name%.rb.tt
  114. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
  115. 0 railties/lib/{ → rails}/generators/rails/plugin/templates/uninstall.rb
  116. 0 railties/lib/{ → rails}/generators/rails/resource/USAGE
  117. +1 −1 railties/lib/{ → rails}/generators/rails/resource/resource_generator.rb
  118. 0 railties/lib/{ → rails}/generators/rails/scaffold/USAGE
  119. +1 −1 railties/lib/{ → rails}/generators/rails/scaffold/scaffold_generator.rb
  120. 0 railties/lib/{ → rails}/generators/rails/scaffold_controller/USAGE
  121. 0 railties/lib/{ → rails}/generators/rails/scaffold_controller/scaffold_controller_generator.rb
  122. 0 railties/lib/{ → rails}/generators/rails/scaffold_controller/templates/controller.rb
  123. 0 railties/lib/{ → rails}/generators/rails/session_migration/USAGE
  124. 0 railties/lib/{ → rails}/generators/rails/session_migration/session_migration_generator.rb
  125. 0 railties/lib/{ → rails}/generators/rails/stylesheets/USAGE
  126. 0 railties/lib/{ → rails}/generators/rails/stylesheets/stylesheets_generator.rb
  127. 0 railties/lib/{ → rails}/generators/rails/stylesheets/templates/scaffold.css
  128. 0 railties/lib/{ → rails}/generators/test_unit.rb
  129. +1 −1 railties/lib/{ → rails}/generators/test_unit/controller/controller_generator.rb
  130. 0 railties/lib/{ → rails}/generators/test_unit/controller/templates/functional_test.rb
  131. +1 −1 railties/lib/{ → rails}/generators/test_unit/helper/helper_generator.rb
  132. 0 railties/lib/{ → rails}/generators/test_unit/helper/templates/helper_test.rb
  133. +1 −1 railties/lib/{ → rails}/generators/test_unit/integration/integration_generator.rb
  134. 0 railties/lib/{ → rails}/generators/test_unit/integration/templates/integration_test.rb
  135. +1 −1 railties/lib/{ → rails}/generators/test_unit/mailer/mailer_generator.rb
  136. 0 railties/lib/{ → rails}/generators/test_unit/mailer/templates/functional_test.rb
  137. +1 −1 railties/lib/{ → rails}/generators/test_unit/model/model_generator.rb
  138. 0 railties/lib/{ → rails}/generators/test_unit/model/templates/fixtures.yml
  139. 0 railties/lib/{ → rails}/generators/test_unit/model/templates/unit_test.rb
  140. +1 −1 railties/lib/{ → rails}/generators/test_unit/observer/observer_generator.rb
  141. 0 railties/lib/{ → rails}/generators/test_unit/observer/templates/unit_test.rb
  142. +1 −1 railties/lib/{ → rails}/generators/test_unit/performance/performance_generator.rb
  143. 0 railties/lib/{ → rails}/generators/test_unit/performance/templates/performance_test.rb
  144. +1 −1 railties/lib/{ → rails}/generators/test_unit/plugin/plugin_generator.rb
  145. 0 railties/lib/{ → rails}/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
  146. 0 railties/lib/{ → rails}/generators/test_unit/plugin/templates/test_helper.rb
  147. +1 −1 railties/lib/{ → rails}/generators/test_unit/scaffold/scaffold_generator.rb
  148. 0 railties/lib/{ → rails}/generators/test_unit/scaffold/templates/functional_test.rb
  149. +1 −1 railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
  150. 0 railties/test/fixtures/lib/{rails_generators → rails/generators}/foobar/foobar_generator.rb
  151. +1 −1 railties/test/generators/actions_test.rb
  152. +1 −1 railties/test/generators/app_generator_test.rb
  153. +1 −1 railties/test/generators/controller_generator_test.rb
  154. +1 −1 railties/test/generators/generator_generator_test.rb
  155. +1 −1 railties/test/generators/generators_test_helper.rb
  156. +1 −1 railties/test/generators/helper_generator_test.rb
  157. +1 −1 railties/test/generators/integration_test_generator_test.rb
  158. +1 −1 railties/test/generators/mailer_generator_test.rb
  159. +1 −1 railties/test/generators/metal_generator_test.rb
  160. +1 −1 railties/test/generators/migration_generator_test.rb
  161. +1 −1 railties/test/generators/model_generator_test.rb
  162. +1 −1 railties/test/generators/named_base_test.rb
  163. +1 −1 railties/test/generators/observer_generator_test.rb
  164. +1 −1 railties/test/generators/performance_test_generator_test.rb
  165. +1 −1 railties/test/generators/plugin_generator_test.rb
  166. +1 −1 railties/test/generators/resource_generator_test.rb
  167. +1 −1 railties/test/generators/scaffold_controller_generator_test.rb
  168. +1 −1 railties/test/generators/scaffold_generator_test.rb
  169. +1 −1 railties/test/generators/session_migration_generator_test.rb
  170. +1 −1 railties/test/generators/stylesheets_generator_test.rb
  171. +2 −2 railties/test/generators_test.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -242,7 +242,7 @@ def self.lookup(namespaces) #:nodoc:
paths = namespaces_to_paths(namespaces)
paths.each do |raw_path|
- ["rails_generators", "generators"].each do |base|
+ ["rails/generators", "generators"].each do |base|
path = "#{base}/#{raw_path}_generator"
begin
@@ -265,7 +265,7 @@ def self.lookup! #:nodoc:
load_generators_from_railties!
$LOAD_PATH.each do |base|
- Dir[File.join(base, "{generators,rails_generators}", "**", "*_generator.rb")].each do |path|
+ Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
begin
require path
rescue Exception => e
@@ -25,7 +25,7 @@ class Base < Thor::Group
def self.source_root
@_rails_source_root ||= begin
if base_name && generator_name
- File.expand_path(File.join("../../generators", base_name, generator_name, 'templates'), File.dirname(__FILE__))
+ File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
end
end
end
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
@@ -1,4 +1,4 @@
-require 'generators/erb/controller/controller_generator'
+require 'rails/generators/erb/controller/controller_generator'
module Erb
module Generators
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
require 'rails/generators/resource_helpers'
module Erb
@@ -5,7 +5,7 @@
module Rails::Generators
# We need to store the RAILS_DEV_PATH in a constant, otherwise the path
# can change in Ruby 1.8.7 when we FileUtils.cd.
- RAILS_DEV_PATH = File.expand_path("../../../../..", File.dirname(__FILE__))
+ RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
RESERVED_NAMES = %w[generate console server dbconsole
application destroy benchmarker profiler
@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
module Rails
module Generators
@@ -1,5 +1,5 @@
require 'rails/generators/resource_helpers'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
module Rails
module Generators
@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
module Rails
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
require 'rails/generators/resource_helpers'
module TestUnit
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
class ActionsTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
class AppGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/controller/controller_generator'
+require 'rails/generators/rails/controller/controller_generator'
class ControllerGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
class GeneratorGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -28,7 +28,7 @@ def self.included(base)
end
def copy_routes
- routes = File.expand_path("../../../lib/generators/rails/app/templates/config/routes.rb", __FILE__)
+ routes = File.expand_path("../../../lib/rails/generators/rails/app/templates/config/routes.rb", __FILE__)
destination = File.join(destination_root, "config")
FileUtils.mkdir_p(destination)
FileUtils.cp File.expand_path(routes), destination
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/helper/helper_generator'
+require 'rails/generators/rails/helper/helper_generator'
ObjectHelper = Class.new
AnotherObjectHelperTest = Class.new
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/integration_test/integration_test_generator'
+require 'rails/generators/rails/integration_test/integration_test_generator'
class IntegrationTestGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/mailer/mailer_generator'
+require 'rails/generators/rails/mailer/mailer_generator'
class MailerGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/metal/metal_generator'
+require 'rails/generators/rails/metal/metal_generator'
class MetalGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/migration/migration_generator'
+require 'rails/generators/rails/migration/migration_generator'
class MigrationGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
class ModelGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
# Mock out what we need from AR::Base.
module ActiveRecord
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/observer/observer_generator'
+require 'rails/generators/rails/observer/observer_generator'
class ObserverGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/performance_test/performance_test_generator'
+require 'rails/generators/rails/performance_test/performance_test_generator'
class PerformanceTestGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/plugin/plugin_generator'
+require 'rails/generators/rails/plugin/plugin_generator'
class PluginGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
class ResourceGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
module Unknown
module Generators
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/scaffold/scaffold_generator'
+require 'rails/generators/rails/scaffold/scaffold_generator'
class ScaffoldGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/session_migration/session_migration_generator'
+require 'rails/generators/rails/session_migration/session_migration_generator'
class SessionMigrationGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,5 +1,5 @@
require 'generators/generators_test_helper'
-require 'generators/rails/stylesheets/stylesheets_generator'
+require 'rails/generators/rails/stylesheets/stylesheets_generator'
class StylesheetsGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
@@ -1,6 +1,6 @@
require 'generators/generators_test_helper'
-require 'generators/rails/model/model_generator'
-require 'generators/test_unit/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
+require 'rails/generators/test_unit/model/model_generator'
require 'mocha'
class GeneratorsTest < Rails::Generators::TestCase

0 comments on commit b61f6f5

Please sign in to comment.