From edbfd64a444c08a8e46d84f0806911ac6f88d28f Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 7 Nov 2018 22:18:30 +0000 Subject: [PATCH 1/2] Set the Spree.user_class explicitly in spree initializer --- config/initializers/spree.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index 72ca8bb14c..a934679676 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -24,6 +24,9 @@ Spree.config do |config| config.order_updater_decorator = OrderUpdater end +# Spree 2.0 recommends explicitly setting this here when using spree_auth_devise +Spree.user_class = 'Spree::User' + # Don't log users out when setting a new password Spree::Auth::Config[:signout_after_password_change] = false From 8aa6b2c0ac97e555b6356778a65327301143a667 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Thu, 8 Nov 2018 00:07:24 +0000 Subject: [PATCH 2/2] Stub spree_api_key on Spree::LegacyUser when signing in as regular user --- lib/spree/api/testing_support/setup.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/spree/api/testing_support/setup.rb b/lib/spree/api/testing_support/setup.rb index 21702e19c5..2ec1bcecef 100644 --- a/lib/spree/api/testing_support/setup.rb +++ b/lib/spree/api/testing_support/setup.rb @@ -8,6 +8,7 @@ module Spree user.stub(:has_spree_role?).with("admin").and_return(false) user.stub(:enterprises) { [] } user.stub(:owned_groups) { [] } + user.stub(:spree_api_key) { "spree_api_key" } user end end