Update email_spec gem

This fixes spec/mailers/notify_spec

Also only require email_spec in the one place it's used

4 files changed, 5 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 7399208cf15..47e8e44a6d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -256,7 +256,7 @@ end
 group :test do
   gem 'simplecov', require: false
   gem 'shoulda-matchers', '~> 2.8.0', require: false
-  gem 'email_spec'
+  gem 'email_spec', '~> 1.6.0'
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c4d824fc749..1dc529a371e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
     dotenv (0.9.0)
     dropzonejs-rails (0.4.14)
       rails (> 3.1)
-    email_spec (1.5.0)
+    email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
     encryptor (1.3.0)
@@ -348,7 +348,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
@@ -755,7 +755,7 @@ DEPENDENCIES
   diffy (~> 3.0.3)
   doorkeeper (= 2.1.3)
   dropzonejs-rails
-  email_spec
+  email_spec (~> 1.6.0)
   enumerize
   factory_girl_rails
   ffaker (~> 2.0.0)
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index c40ae7b5703..89853d05161 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'email_spec'
 
 describe Notify do
   include EmailSpec::Helpers
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9c8004ab555..666d56079d7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'shoulda/matchers'
-require 'email_spec'
 require 'sidekiq/testing/inline'
 
 # Requires supporting ruby files with custom matchers and macros, etc,