Merge pull request #463 from offmango/fix_guest_token_errors_when_upg…

…rading_spree

Fixes errors around guest_token when upgrading to Spree 3.7

config/initializers/warden.rb

@@ -1,18 +1,14 @@
 # Merges users orders to their account after sign in and sign up.
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
-  guest_token = auth.cookies.signed[:guest_token]
-  token       = auth.cookies.signed[:token]
+  token = auth.cookies.signed[:guest_token] || auth.cookies.signed[:token]
+  token_attr = Spree::Order.has_attribute?(:token) ? :token : :guest_token
 
   if token.present? && user.is_a?(Spree::User)
-    Spree::Order.incomplete.where(token: token, user_id: nil).each do |order|
-      order.associate_user!(user)
-    end
-  elsif guest_token.present? && user.is_a?(Spree::User)
-    Spree::Order.incomplete.where(guest_token: guest_token, user_id: nil).each do |order|
+    Spree::Order.incomplete.where(token_attr => token, user_id: nil).each do |order|
       order.associate_user!(user)
     end
   end
-end
+end 
 
 Warden::Manager.before_logout do |_user, auth, _opts|
   auth.cookies.delete(:guest_token)

spec/controllers/spree/user_sessions_controller_spec.rb

@@ -132,6 +132,26 @@
         end
       end
 
+      context 'with a guest_token from a pre-3.7 version of Spree present' do
+        before do
+          request.cookie_jar.signed[:guest_token] = 'ABC'
+          request.cookie_jar.signed[:token] = 'DEF'
+        end
+
+        it 'assigns the correct token attribute for the order' do 
+          if Spree.version.to_f > 3.6
+            order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
+          else
+            order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
+          end
+          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+          order.reload
+          expect(order.user_id).to eq user.id
+          expect(order.created_by_id).to eq user.id
+        end 
+      end
+
       context "and html format is used" do
         it "redirects to default after signing in" do
           spree_post :create, spree_user: { email: user.email, password: 'secret' }