diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 454c4361d843e..72794554920b9 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,10 @@ +* Set `action_mailer.default_url_options` values in `development` and `test`. + + Prior to this commit, new Rails applications would raise `ActionView::Template::Error` + if a mailer included a url built with a `*_path` helper. + + *Steve Polito* + * Introduce `Rails::Generators::Testing::Assertions#assert_initializer` Compliments the existing `initializer` generator action. diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 9d9f0d9ceb661..4610e99c7fc69 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -43,6 +43,8 @@ Rails.application.configure do config.action_mailer.raise_delivery_errors = false config.action_mailer.perform_caching = false + + config.action_mailer.default_url_options = { host: "localhost", port: 3000 } <%- end -%> # Print deprecation notices to the Rails logger. diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 3fed28b706582..0ab0765dce5a9 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -44,6 +44,10 @@ Rails.application.configure do # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test + # Unlike controllers, the mailer instance doesn't have any context about the + # incoming request so you'll need to provide the :host parameter yourself. + config.action_mailer.default_url_options = { host: "www.example.com" } + <%- end -%> # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr