diff options
| -rw-r--r-- | actionmailer/test/old_base/url_test.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/commands/destroy.rb | 1 | ||||
| -rwxr-xr-x | railties/lib/rails/commands/generate.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators.rb | 3 | ||||
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index ad8b1109c9..d851431c7a 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -4,9 +4,11 @@ require 'action_controller' class WelcomeController < ActionController::Base end -class TestMailer < ActionMailer::Base +class ActionMailer::Base include ActionController::UrlFor +end +class TestMailer < ActionMailer::Base default_url_options[:host] = 'www.basecamphq.com' def signed_up_with_url(recipient) diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index a2eff377ce..92a06ebdd8 100644 --- a/railties/lib/rails/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb @@ -1,5 +1,4 @@ require 'rails/generators' -Rails::Generators.configure! if ARGV.size == 0 Rails::Generators.help diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb index c1120aad74..5e45d8ab46 100755 --- a/railties/lib/rails/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb @@ -1,5 +1,4 @@ require 'rails/generators' -Rails::Generators.configure! if ARGV.size == 0 Rails::Generators.help diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 1271de7af9..90b513fcb4 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -286,3 +286,6 @@ module Rails end end +# If the application was already defined, configure generators, +# otherwise you have to configure it by hand. +Rails::Generators.configure! if Rails.respond_to?(:application) && Rails.application
\ No newline at end of file diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index d17be5b964..3cd16a69f9 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -9,7 +9,7 @@ Rails.application.config.root = Rails.root require 'rails/generators' require 'rails/generators/test_case' -Rails::Generators.configure! + require 'active_record' require 'action_dispatch' |