Merge pull request #198 from orientation/update-mandrill_mailer

Bump to mandrill_mailer & kill custom matchers
orientation · Apr 28, 2016 · 4145845 · 4145845
2 parents 838476a + 7017703
commit 4145845
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 294 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ gem 'omniauth'
 gem 'omniauth-google-oauth2'
 gem 'draper'
 gem 'textacular'
-gem 'mandrill_mailer'
+gem 'mandrill_mailer', '~> 1.1.0'
 gem 'responders','~> 2.0'
 gem 'skylight'
 gem 'bugsnag'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
       activesupport (>= 3.0)
       request_store (~> 1.0)
     erubis (2.7.0)
-    excon (0.44.4)
+    excon (0.49.0)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -148,7 +148,7 @@ GEM
     mandrill-api (1.0.53)
       excon (>= 0.16.0, < 1.0)
       json (>= 1.7.7, < 2.0)
-    mandrill_mailer (0.5.1)
+    mandrill_mailer (1.1.0)
       actionpack
       activesupport
       mandrill-api (~> 1.0.9)
@@ -341,7 +341,7 @@ DEPENDENCIES
   friendly_id
   haml-rails
   launchy
-  mandrill_mailer
+  mandrill_mailer (~> 1.1.0)
   omniauth
   omniauth-google-oauth2
   pg
@@ -368,8 +368,5 @@ DEPENDENCIES
   unicorn
   web-console (~> 2.0)
 
-RUBY VERSION
-   ruby 2.3.0p0
-
 BUNDLED WITH
    1.12.0.rc
diff --git a/app.json b/app.json
@@ -19,7 +19,6 @@
     "GOOGLE_SECRET": "REDACTED",
     "GOOGLE_KEY": "REDACTED",
     "MANDRILL_USERNAME": "REDACTED",
-    "MANDRILL_PASSWORD": "REDACTED",
     "MANDRILL_API_KEY": "REDACTED",
     "MANDRILL_DOMAIN": "heroku.com"
   },

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -83,4 +83,7 @@
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+
+  require "mandrill_mailer/rspec_helper"
+  config.include MandrillMailer::RSpecHelper
 end
diff --git a/spec/support/mandrill_mailer_matchers/from_matcher.rb b/spec/support/mandrill_mailer_matchers/from_matcher.rb
diff --git a/spec/support/mandrill_mailer_matchers/merge_var_content_checker.rb b/spec/support/mandrill_mailer_matchers/merge_var_content_checker.rb
diff --git a/spec/support/mandrill_mailer_matchers/merge_var_matcher.rb b/spec/support/mandrill_mailer_matchers/merge_var_matcher.rb
diff --git a/spec/support/mandrill_mailer_matchers/subject_matcher.rb b/spec/support/mandrill_mailer_matchers/subject_matcher.rb
diff --git a/spec/support/mandrill_mailer_matchers/template_matcher.rb b/spec/support/mandrill_mailer_matchers/template_matcher.rb
diff --git a/spec/support/mandrill_mailer_matchers/to_email_matcher.rb b/spec/support/mandrill_mailer_matchers/to_email_matcher.rb