From 4060e7debf71fce58efb2a26f29c045ffe90f565 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sun, 1 Nov 2020 11:11:28 +0000
Subject: [PATCH] Replace usages of Spree::BaseController with
 ApplicationController

---
 app/controllers/spree/admin/base_controller.rb    | 2 +-
 lib/spree/core/controller_helpers/respond_with.rb | 2 +-
 lib/spree/i18n/initializer.rb                     | 2 +-
 lib/spree/responder.rb                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/spree/admin/base_controller.rb b/app/controllers/spree/admin/base_controller.rb
index 4f9cdbb4d0..8d002b583c 100644
--- a/app/controllers/spree/admin/base_controller.rb
+++ b/app/controllers/spree/admin/base_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class BaseController < Spree::BaseController
+    class BaseController < ApplicationController
       ssl_required
 
       helper 'spree/admin/navigation'
diff --git a/lib/spree/core/controller_helpers/respond_with.rb b/lib/spree/core/controller_helpers/respond_with.rb
index 5fcd4bc2cb..c35a071f25 100644
--- a/lib/spree/core/controller_helpers/respond_with.rb
+++ b/lib/spree/core/controller_helpers/respond_with.rb
@@ -16,7 +16,7 @@ module ActionController
 
       # Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
       if (defined_response = collector.response) &&
-         !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[],
+         !ApplicationController.spree_responders[self.class.to_s.to_sym].try(:[],
                                                                              action_name.to_sym)
         if action = options.delete(:action)
           render action: action
diff --git a/lib/spree/i18n/initializer.rb b/lib/spree/i18n/initializer.rb
index 64b649f708..9be3e4df0d 100644
--- a/lib/spree/i18n/initializer.rb
+++ b/lib/spree/i18n/initializer.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Spree::BaseController.include(Spree::ViewContext)
+ApplicationController.include(Spree::ViewContext)
diff --git a/lib/spree/responder.rb b/lib/spree/responder.rb
index 3c0e60aa5b..2714599530 100644
--- a/lib/spree/responder.rb
+++ b/lib/spree/responder.rb
@@ -10,7 +10,7 @@ module Spree
       class_name = controller.class.name.to_sym
       action_name = options.delete(:action_name)
 
-      result = Spree::BaseController.spree_responders[class_name].
+      result = ApplicationController.spree_responders[class_name].
         try(:[], action_name).
         try(:[], self.format.to_sym)
       return unless result