diff options
Diffstat (limited to 'railties/test/application')
-rw-r--r-- | railties/test/application/configuration_test.rb | 14 | ||||
-rw-r--r-- | railties/test/application/mailer_previews_test.rb | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 1feedb6602..2e056be561 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -966,28 +966,28 @@ module ApplicationTests assert db_config.is_a?(Hash) end - test 'config.mail_preview_enabled defaults to true in development' do + test 'config.action_mailer.show_previews defaults to true in development' do Rails.env = "development" require "#{app_path}/config/environment" - assert Rails.application.config.action_mailer.preview_enabled + assert Rails.application.config.action_mailer.show_previews end - test 'config.mail_preview_enabled defaults to false in production' do + test 'config.action_mailer.show_previews defaults to false in production' do Rails.env = "production" require "#{app_path}/config/environment" - assert_equal Rails.application.config.action_mailer.preview_enabled, false + assert_equal Rails.application.config.action_mailer.show_previews, false end - test 'config.mail_preview_enabled can be set in the configuration file' do + test 'config.action_mailer.show_previews can be set in the configuration file' do Rails.env = "production" add_to_config <<-RUBY - config.action_mailer.preview_enabled = true + config.action_mailer.show_previews = true RUBY require "#{app_path}/config/environment" - assert_equal Rails.application.config.action_mailer.preview_enabled, true + assert_equal Rails.application.config.action_mailer.show_previews, true end end end diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb index d17eb0a8d1..8b91a1171f 100644 --- a/railties/test/application/mailer_previews_test.rb +++ b/railties/test/application/mailer_previews_test.rb @@ -27,14 +27,14 @@ module ApplicationTests end test "/rails/mailers is accessible with correct configuraiton" do - add_to_config "config.action_mailer.preview_enabled = true" + add_to_config "config.action_mailer.show_previews = true" app("production") get "/rails/mailers" assert_equal 200, last_response.status end - test "/rails/mailers is not accessible with preview_enabled = false" do - add_to_config "config.action_mailer.preview_enabled = false" + test "/rails/mailers is not accessible with show_previews = false" do + add_to_config "config.action_mailer.show_previews = false" app("development") get "/rails/mailers" assert_equal 404, last_response.status |