Merge pull request #29 from priyank-gupta/master

bump version to 3.1.0, fix spec
spree-contrib · Apr 7, 2016 · f4488bf · f4488bf
2 parents a0f29c6 + 6c0c752
commit f4488bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-spree_version = 'master'
+spree_version = '3-1-stable'
 gem 'spree', github: 'spree/spree', branch: spree_version
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_version
 

diff --git a/lib/spree_mail_settings/version.rb b/lib/spree_mail_settings/version.rb
@@ -11,7 +11,7 @@ module VERSION
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = 'beta'
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

diff --git a/spec/lib/mail_interceptor_spec.rb b/spec/lib/mail_interceptor_spec.rb
@@ -12,6 +12,7 @@
 
   context '#deliver' do
     before do
+      store.send(:clear_cache)
       ActionMailer::Base.delivery_method = :test
       Spree::Config[:intercept_email] = ''
     end