Fix autoload issue on Solidus v3.1.0

Author: Jonathan Tapia

app/models/spree/user.rb

@@ -3,21 +3,12 @@
 module Spree
   class User < Spree::Base
     include UserMethods
+    include Spree::SoftDeletable
 
     devise :database_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :encryptable
     devise :confirmable if Spree::Auth::Config[:confirmable]
 
-    if defined?(Spree::SoftDeletable)
-      include Spree::SoftDeletable
-    else
-      acts_as_paranoid
-      include Spree::ParanoiaDeprecations
-
-      include Discard::Model
-      self.discard_column = :deleted_at
-    end
-
     after_destroy :scramble_email_and_password
     after_discard :scramble_email_and_password
 

spec/controllers/spree/user_registrations_controller_spec.rb

@@ -13,15 +13,15 @@
     let(:password_confirmation) { 'foobar123' }
 
     subject do
-      post(:create, {
+      post(:create,
         params: {
           spree_user: {
             email: '[email protected]',
             password: 'foobar123',
             password_confirmation: password_confirmation
           }
         }
-      })
+      )
     end
 
     context 'when user created successfuly' do

spec/controllers/spree/user_sessions_controller_spec.rb

@@ -10,15 +10,15 @@
     let(:password) { 'secret' }
 
     subject do
-      post(:create, {
+      post(:create,
         params: {
           spree_user: {
             email: user.email,
             password: password
           },
           format: format
         }
-      })
+      )
     end
 
     context "when using correct login information" do