diff options
author | ilya <ilya@laptop.(none)> | 2010-10-23 03:36:43 +0400 |
---|---|---|
committer | ilya <ilya@laptop.(none)> | 2010-10-23 03:36:54 +0400 |
commit | b337d5acc9ab28d921ad31c23058a65994c27835 (patch) | |
tree | 2a92556ddac2b7bf10eaedece8838af914313fe5 /config/initializers/mailer_config.rb | |
parent | 5af3d5fa820a9e2dc17ffae03f1fd78068cb7485 (diff) |
delivery method test in tests
Diffstat (limited to 'config/initializers/mailer_config.rb')
-rw-r--r-- | config/initializers/mailer_config.rb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index 73928f740..cbc5f7330 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -3,15 +3,17 @@ # the COPYRIGHT file. 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.smtp_settings = { - :address => APP_CONFIG[:smtp_address], - :port => APP_CONFIG[:smtp_port], - :domain => APP_CONFIG[:smtp_domain], - :authentication => APP_CONFIG[:smtp_authentication], - :user_name => APP_CONFIG[:smtp_username], - :password => APP_CONFIG[:smtp_password], - :enable_starttls_auto => true - } + unless Rails.env == 'test' + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + :address => APP_CONFIG[:smtp_address], + :port => APP_CONFIG[:smtp_port], + :domain => APP_CONFIG[:smtp_domain], + :authentication => APP_CONFIG[:smtp_authentication], + :user_name => APP_CONFIG[:smtp_username], + :password => APP_CONFIG[:smtp_password], + :enable_starttls_auto => true + } + end end |