Fix user unloading in confirmation related specs

config/initializers/warden.rb

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

spec/features/confirmation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Confirmation' do
+RSpec.feature 'Confirmation', type: :feature, reload_user: true do
   before do
     set_confirmable_option(true)
     Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))

spec/models/user_spec.rb

@@ -63,7 +63,7 @@
     end
   end
 
-  describe "confirmable" do
+  describe "confirmable", reload_user: true do
     it "is confirmable if the confirmable option is enabled" do
       set_confirmable_option(true)
       Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))

spec/support/user_helper.rb

@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+  # allows to keep user const after reload
+  config.around :each, :reload_user do |example|
+    old_user = Spree::User
+
+    example.run
+
+    Spree.send(:remove_const, 'User')
+    Spree.const_set('User', old_user)
+  end
+end