Merge pull request #176 from nebulab/kennyadsl/zeitwerk-fixes

Fixes for Zeitwerk

Author: kennyadsl

app/overrides/auth_admin_login_navigation_bar.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-Spree::Admin::Orders::CustomerDetailsController.class_eval do
-  before_action :check_authorization
+module Spree::Admin::Orders::CustomerDetailsControllerDecorator
+  def self.prepended(base)
+    base.before_action :check_authorization
+  end
 
   private
 
@@ -15,4 +17,6 @@ def check_authorization
 
     authorize! action, resource, session[:access_token]
   end
+
+  Spree::Admin::Orders::CustomerDetailsController.prepend self
 end

app/overrides/auth_shared_login_bar.rb

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.2.0", "< 3"]
+  solidus_version = [">= 2.6", "< 3"]
 
   s.post_install_message = "
     NOTE: Rails 6 has removed secret_token in favor of secret_key_base, which was deprecated in

lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb

@@ -16,13 +16,9 @@
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    if SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.x')
+
+    expect {
       get :show, params: { id: product.to_param }
-      expect(response.status).to eq(404)
-    else
-      expect {
-        get :show, params: { id: product.to_param }
-      }.to raise_error(ActiveRecord::RecordNotFound)
-    end
+    }.to raise_error(ActiveRecord::RecordNotFound)
   end
 end