Merge pull request coderwall#172 from seuros/avatardev

just3ws · just3ws · commit a6d54d4c25fe · 2014-08-13T15:54:42.000-05:00
Avatar is not present when Developer Strategy is used
diff --git a/app/models/concerns/user_oauth.rb b/app/models/concerns/user_oauth.rb
@@ -51,7 +51,8 @@ def for_omniauth(auth)
             backup_email: auth[:info][:email],
             location: location_from(auth))
         #FIXME VCR raise an error when we try to download the image
-        user.avatar.download! avatar_url_for(auth)    unless Rails.env.test?
+        avatar_url = avatar_url_for(auth)
+        user.avatar.download! avatar_url if avatar_url.present? && !Rails.env.test?
         user.apply_oauth(auth)
         user.username = auth[:info][:nickname]
       end
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -5,7 +5,6 @@
 
   config.action_controller.perform_caching = false
   config.action_dispatch.best_standards_support = :builtin
-  config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.raise_delivery_errors = false
   config.active_support.deprecation = :log
   config.assets.compile = true
