kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Keep configuration of smtp_settings consistent between 6.1 and 7.0

Browse source
This commit is contained in:
André Luis Leal Cardoso Junior 2022-01-03 23:52:52 -03:00
parent ee95658b25
commit 02b7854db5
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionmailer/lib/action_mailer/railtie.rb
View file

@ -23,6 +23,7 @@ module ActionMailer
options.stylesheets_dir ||= paths["public/stylesheets"].first options.stylesheets_dir ||= paths["public/stylesheets"].first
options.show_previews = Rails.env.development? if options.show_previews.nil? options.show_previews = Rails.env.development? if options.show_previews.nil?
options.cache_store ||= Rails.cache options.cache_store ||= Rails.cache
options.smtp_settings ||= {}
if options.show_previews if options.show_previews
options.preview_path ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil options.preview_path ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
@ -45,13 +46,9 @@ module ActionMailer
self.delivery_job = delivery_job.constantize self.delivery_job = delivery_job.constantize
end end
if smtp_settings = options.delete(:smtp_settings)
self.smtp_settings = smtp_settings
end
if smtp_timeout = options.delete(:smtp_timeout) if smtp_timeout = options.delete(:smtp_timeout)
self.smtp_settings[:open_timeout] ||= smtp_timeout options.smtp_settings[:open_timeout] ||= smtp_timeout
self.smtp_settings[:read_timeout] ||= smtp_timeout options.smtp_settings[:read_timeout] ||= smtp_timeout
end end
options.each { |k, v| send("#{k}=", v) } options.each { |k, v| send("#{k}=", v) }

20
railties/test/application/configuration_test.rb
View file

@ -2745,21 +2745,31 @@ module ApplicationTests
test "Rails.application.config.action_mailer.smtp_settings have open_timeout and read_timeout defined as 5 in 7.0 defaults" do test "Rails.application.config.action_mailer.smtp_settings have open_timeout and read_timeout defined as 5 in 7.0 defaults" do
remove_from_config '.*config\.load_defaults.*\n' remove_from_config '.*config\.load_defaults.*\n'
add_to_config 'config.load_defaults "7.0"' add_to_config <<-RUBY
config.action_mailer.smtp_settings = { domain: "example.com" }
config.load_defaults "7.0"
RUBY
app "development" app "development"
assert_equal 5, ActionMailer::Base.smtp_settings[:open_timeout] smtp_settings = { domain: "example.com", open_timeout: 5, read_timeout: 5 }
assert_equal 5, ActionMailer::Base.smtp_settings[:read_timeout]
assert_equal smtp_settings, ActionMailer::Base.smtp_settings
assert_equal smtp_settings, Rails.configuration.action_mailer.smtp_settings
end end
test "Rails.application.config.action_mailer.smtp_settings does not have open_timeout and read_timeout configured on other versions" do test "Rails.application.config.action_mailer.smtp_settings does not have open_timeout and read_timeout configured on other versions" do
remove_from_config '.*config\.load_defaults.*\n' remove_from_config '.*config\.load_defaults.*\n'
add_to_config <<-RUBY
config.action_mailer.smtp_settings = { domain: "example.com" }
RUBY
app "development" app "development"
assert_nil ActionMailer::Base.smtp_settings[:open_timeout] smtp_settings = { domain: "example.com" }
assert_nil ActionMailer::Base.smtp_settings[:read_timeout]
assert_equal smtp_settings, ActionMailer::Base.smtp_settings
assert_equal smtp_settings, ActionMailer::Base.smtp_settings
end end
test "ActiveSupport.utc_to_local_returns_utc_offset_times is true in 6.1 defaults" do test "ActiveSupport.utc_to_local_returns_utc_offset_times is true in 6.1 defaults" do