Update spree and spree_auth_devise

Gemfile.lock

@@ -14,45 +14,45 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: da651b40f5c6cdd32e00b060729eb9aefd4f615f
+  revision: bbe5e779bcb883a1726ad4006d7c06b06c3f5372
   branch: 1-3-stable
   specs:
-    spree (1.3.3)
-      spree_api (= 1.3.3)
-      spree_cmd (= 1.3.3)
-      spree_core (= 1.3.3)
-      spree_promo (= 1.3.3)
-      spree_sample (= 1.3.3)
-    spree_api (1.3.3)
-      spree_core (= 1.3.3)
+    spree (1.3.6.beta)
+      spree_api (= 1.3.6.beta)
+      spree_cmd (= 1.3.6.beta)
+      spree_core (= 1.3.6.beta)
+      spree_promo (= 1.3.6.beta)
+      spree_sample (= 1.3.6.beta)
+    spree_api (1.3.6.beta)
+      spree_core (= 1.3.6.beta)
       versioncake (= 0.4.0)
-    spree_cmd (1.3.3)
+    spree_cmd (1.3.6.beta)
       thor (>= 0.14.6)
-    spree_core (1.3.3)
+    spree_core (1.3.6.beta)
       activemerchant (~> 1.34)
       acts_as_list (= 0.1.4)
       awesome_nested_set (= 2.1.5)
-      aws-sdk (~> 1.3.4)
+      aws-sdk (~> 1.11.1)
       cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
       highline (= 1.6.18)
       jquery-rails (~> 2.2.0)
       json (>= 1.5.5)
-      kaminari (= 0.13.0)
-      money (= 5.0.0)
+      kaminari (= 0.14.1)
+      money (= 5.1.1)
       paperclip (~> 2.8)
       rabl (= 0.7.2)
-      rails (~> 3.2.14)
+      rails (~> 3.2.16)
       ransack (= 0.7.2)
       select2-rails (= 3.2.1)
       state_machine (= 1.1.2)
       stringex (~> 1.3.2)
       truncate_html (~> 0.5.5)
-    spree_promo (1.3.3)
-      spree_core (= 1.3.3)
-    spree_sample (1.3.3)
-      spree_core (= 1.3.3)
+    spree_promo (1.3.6.beta)
+      spree_core (= 1.3.6.beta)
+    spree_sample (1.3.6.beta)
+      spree_core (= 1.3.6.beta)
 
 GIT
   remote: git://github.com/openfoodfoundation/spree_paypal_express.git
@@ -74,10 +74,10 @@ GIT
 
 GIT
   remote: git://github.com/spree/spree_auth_devise.git
-  revision: 6a50345b73bcec614a8fbd358a2367c00c8ab56f
+  revision: ba95589a85368297c844f096c2a0c121e5b08138
   branch: 1-3-stable
   specs:
-    spree_auth_devise (1.0.0)
+    spree_auth_devise (1.3.0)
       cancan (~> 1.6.7)
       devise (~> 2.2.3)
       devise-encryptable (= 0.1.2)
@@ -120,10 +120,10 @@ GEM
     active_link_to (1.0.0)
     active_model_serializers (0.8.1)
       activemodel (>= 3.0)
-    active_utils (2.0.2)
+    active_utils (2.2.1)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.43.0)
+    activemerchant (1.43.1)
       active_utils (~> 2.0, >= 2.0.1)
       activesupport (>= 2.3.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
@@ -158,12 +158,13 @@ GEM
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     awesome_print (1.0.2)
-    aws-sdk (1.3.9)
-      httparty (~> 0.7)
+    aws-sdk (1.11.1)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     bugsnag (1.5.2)
       httparty (>= 0.6, < 1.0)
       multi_json (~> 1.0)
@@ -192,7 +193,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    colorize (0.7.2)
+    colorize (0.7.3)
     columnize (0.3.6)
     comfortable_mexican_sofa (1.6.24)
       active_link_to (~> 1.0.0)
@@ -218,7 +219,7 @@ GEM
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
-    devise (2.2.7)
+    devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -301,10 +302,9 @@ GEM
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
-    kaminari (0.13.0)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     kgio (2.7.4)
     launchy (2.1.2)
       addressable (~> 2.3)
@@ -321,22 +321,21 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    money (5.0.0)
-      i18n (~> 0.4)
-      json
+    money (5.1.1)
+      i18n (~> 0.6.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
     newrelic_rpm (3.6.7.152)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     oj (2.1.2)
-    orm_adapter (0.4.0)
+    orm_adapter (0.5.0)
     paperclip (2.8.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
@@ -351,7 +350,7 @@ GEM
       websocket-driver (>= 0.2.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -387,7 +386,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.9.0)
-    rake (10.3.1)
+    rake (10.3.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)

app/models/spree/product_decorator.rb

@@ -193,7 +193,7 @@ Spree::Product.class_eval do
   end
 
   def add_primary_taxon_to_taxons
-    taxons << primary_taxon unless taxons.find_by_id(primary_taxon)
+    taxons << primary_taxon unless taxons.include? primary_taxon
   end
 
   def self.all_variant_unit_option_types

spec/controllers/checkout_controller_spec.rb

@@ -40,9 +40,7 @@ describe CheckoutController do
 
   it "doesn't copy the previous shipping address from a pickup order" do
     old_order = create(:order, bill_address: create(:address), ship_address: create(:address))
-    old_order.shipping_method.stub_chain(:andand, :require_ship_address).and_return(false)
     Spree::Order.stub_chain(:order, :where, :where, :limit, :detect).and_return(old_order)
-
     controller.send(:find_last_used_addresses, "email").last.should == nil 
   end
 
@@ -81,6 +79,7 @@ describe CheckoutController do
   context "via xhr" do
     before do
       controller.stub(:current_distributor).and_return(distributor)
+
       controller.stub(:current_order_cycle).and_return(order_cycle)
       controller.stub(:current_order).and_return(order)
     end