Merge pull request #34 from jgunnink/setup_sendgrid

Setup sendgrid
jgunnink · Oct 17, 2016 · 5dd77e9 · 5dd77e9
2 parents db3f3c5 + 90dc2a2
commit 5dd77e9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,5 +1,5 @@
 # Set defaults for outgoing mail.
 class ApplicationMailer < ActionMailer::Base
-  default from: 'Captain Santa <santa@secretsanta.com>'
+  default from: 'Captain Santa <captain-santa@secretsanta.website>'
   layout 'mailer'
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -43,7 +43,15 @@
   config.i18n.fallbacks = true
 
   # ActionMailer settings
-  config.action_mailer.delivery_method = :smtp
+  ActionMailer::Base.smtp_settings = {
+    :user_name => ENV["sendgrid_username"],
+    :password => ENV["sendgrid_password"],
+    :domain => 'secretsanta.website',
+    :address => 'smtp.sendgrid.net',
+    :port => 587,
+    :authentication => :plain,
+    :enable_starttls_auto => true
+  }
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify

diff --git a/spec/mailers/assignment_mailer_spec.rb b/spec/mailers/assignment_mailer_spec.rb
@@ -12,7 +12,7 @@
     end
     let!(:list) { santa.list }
 
-    it { should deliver_from('Captain Santa <santa@secretsanta.com>') }
+    it { should deliver_from('Captain Santa <captain-santa@secretsanta.website>') }
     it { should have_subject "Your Secret Santa for #{list.name}" }
     it { should have_content "Dear #{santa.name}" }
     it { should have_content "You're on the list for #{list.name}" }