delivery method test in tests
This commit is contained in:
parent
5af3d5fa82
commit
b337d5acc9
1 changed files with 12 additions and 10 deletions
|
|
@ -3,15 +3,17 @@
|
||||||
# the COPYRIGHT file.
|
# the COPYRIGHT file.
|
||||||
|
|
||||||
Diaspora::Application.configure do
|
Diaspora::Application.configure do
|
||||||
config.action_mailer.delivery_method = :smtp
|
|
||||||
config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
|
config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
|
||||||
config.action_mailer.smtp_settings = {
|
unless Rails.env == 'test'
|
||||||
:address => APP_CONFIG[:smtp_address],
|
config.action_mailer.delivery_method = :smtp
|
||||||
:port => APP_CONFIG[:smtp_port],
|
config.action_mailer.smtp_settings = {
|
||||||
:domain => APP_CONFIG[:smtp_domain],
|
:address => APP_CONFIG[:smtp_address],
|
||||||
:authentication => APP_CONFIG[:smtp_authentication],
|
:port => APP_CONFIG[:smtp_port],
|
||||||
:user_name => APP_CONFIG[:smtp_username],
|
:domain => APP_CONFIG[:smtp_domain],
|
||||||
:password => APP_CONFIG[:smtp_password],
|
:authentication => APP_CONFIG[:smtp_authentication],
|
||||||
:enable_starttls_auto => true
|
:user_name => APP_CONFIG[:smtp_username],
|
||||||
}
|
:password => APP_CONFIG[:smtp_password],
|
||||||
|
:enable_starttls_auto => true
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue