Bump to mandrill_mailer & kill custom matchers

This new version of mandrill_mailer will include the custom matchers so that we don't have to cache them inside Orientation anymore.
codeschool · Oct 2, 2015 · a0a4bff · a0a4bff
1 parent 85bac3d
commit a0a4bff
Show file tree

Hide file tree

Showing 9 changed files with 16 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', github: 'olivierlacan/mandrill_mailer'
 gem 'responders','~> 2.0'
 gem 'skylight'
 gem 'bugsnag'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: git://github.com/olivierlacan/mandrill_mailer.git
+  revision: ca8441d4756f72bcb09cc402a76c6d4a853dfda2
+  specs:
+    mandrill_mailer (0.5.1)
+      actionpack
+      activesupport
+      mandrill-api (~> 1.0.9)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -95,7 +104,7 @@ GEM
       activesupport (>= 3.0)
       request_store (~> 1.0)
     erubis (2.7.0)
-    excon (0.44.4)
+    excon (0.45.4)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -146,14 +155,10 @@ GEM
     mandrill-api (1.0.53)
       excon (>= 0.16.0, < 1.0)
       json (>= 1.7.7, < 2.0)
-    mandrill_mailer (0.5.1)
-      actionpack
-      activesupport
-      mandrill-api (~> 1.0.9)
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.8.0)
+    minitest (5.8.1)
     multi_json (1.11.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -337,7 +342,7 @@ DEPENDENCIES
   friendly_id
   gemoji
   haml-rails
-  mandrill_mailer
+  mandrill_mailer!
   omniauth
   omniauth-google-oauth2
   pg

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_helpers"
+  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