Conflicts:

spree_wishlist.gemspec
spree-contrib · Jan 28, 2014 · 56f1f23 · 56f1f23 · runlevel5 · Jan 28, 2014
1 parent 18dcb5b
commit 56f1f23
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem 'spree', github: 'spree/spree'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise'
+gem 'spree', github: 'spree/spree', branch: '2-1-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
 
 # Specify your dependencies in spree_wishlist.gemspec
 gemspec
diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
@@ -2,7 +2,7 @@
   has_many :wishlists, :class_name => Spree::Wishlist
 
   def wishlist
-    default_wishlist = self.wishlists.first(:conditions => ["is_default = ?", true])
+    default_wishlist = self.wishlists.where(is_default: true).first
     default_wishlist ||= self.wishlists.first
     default_wishlist ||= self.wishlists.create(:name => Spree.t(:default_wishlist_name, :default => "My wishlist"), :is_default => true)
     default_wishlist.update_attribute(:is_default, true) unless default_wishlist.is_default?

diff --git a/app/models/spree/wishlist.rb b/app/models/spree/wishlist.rb
@@ -24,7 +24,7 @@ def can_be_read_by?(user)
   def is_default=(value)
     self['is_default'] = value
     if self.is_default?
-      Spree::Wishlist.update_all({:is_default => false}, ["id != ? AND is_default = ? AND user_id = ?", self.id, true, self.user_id])
+      Spree::Wishlist.where(is_default: true, user_id: self.user_id).where.not(id: self.id).update_all(is_default: false)
     end
   end
 

diff --git a/spree_wishlist.gemspec b/spree_wishlist.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'spree_core', '~> 2.1.0'
+  s.add_dependency 'spree_core', '~> 2.1.2'
 
   s.add_development_dependency 'factory_girl', '~> 4.2'
   s.add_development_dependency 'ffaker'
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'poltergeist'
-  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'database_cleaner', '<= 1.0.1'
   s.add_development_dependency 'simplecov'
 end