From 80bd9f993e83a619407985379878406d8222a1b1 Mon Sep 17 00:00:00 2001 From: Alberto Vena Date: Tue, 8 Oct 2019 10:37:00 +0200 Subject: [PATCH 1/4] Remove deface overrides for old solidus versions They are not compatible with Zeitwerk, which is shipped with Rails 6. Since they are not used in Solidus versions that are compatible with Rails 6, there's no reason to keep them. --- app/overrides/auth_admin_login_navigation_bar.rb | 10 ---------- app/overrides/auth_shared_login_bar.rb | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 app/overrides/auth_admin_login_navigation_bar.rb delete mode 100644 app/overrides/auth_shared_login_bar.rb diff --git a/app/overrides/auth_admin_login_navigation_bar.rb b/app/overrides/auth_admin_login_navigation_bar.rb deleted file mode 100644 index 17d6f55e..00000000 --- a/app/overrides/auth_admin_login_navigation_bar.rb +++ /dev/null @@ -1,10 +0,0 @@ -if SolidusSupport.solidus_gem_version < Gem::Version.new('1.2') - Deface::Override.new( - virtual_path: "spree/admin/shared/_header", - name: "auth_admin_login_navigation_bar", - insert_before: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]", - partial: "spree/layouts/admin/login_nav", - disabled: false, - original: '841227d0aedf7909d62237d8778df99100087715' - ) -end diff --git a/app/overrides/auth_shared_login_bar.rb b/app/overrides/auth_shared_login_bar.rb deleted file mode 100644 index cc651e99..00000000 --- a/app/overrides/auth_shared_login_bar.rb +++ /dev/null @@ -1,10 +0,0 @@ -if SolidusSupport.frontend_available? && SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.x') - Deface::Override.new( - virtual_path: "spree/shared/_nav_bar", - name: "auth_shared_login_bar", - insert_before: "li#search-bar", - partial: "spree/shared/login_bar_items", - disabled: false, - original: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac' - ) -end From 58d989e4a8268b205022c8a58d5bd628d5d68620 Mon Sep 17 00:00:00 2001 From: Alberto Vena Date: Tue, 8 Oct 2019 10:40:40 +0200 Subject: [PATCH 2/4] Remove code for Soldius 2.5 is specs --- spec/controllers/spree/products_controller_spec.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spec/controllers/spree/products_controller_spec.rb b/spec/controllers/spree/products_controller_spec.rb index 83a781bf..8596f3b0 100644 --- a/spec/controllers/spree/products_controller_spec.rb +++ b/spec/controllers/spree/products_controller_spec.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 From 49fb04c2328ee254bd32318ca2907591c5c735e4 Mon Sep 17 00:00:00 2001 From: Alberto Vena Date: Tue, 8 Oct 2019 10:53:05 +0200 Subject: [PATCH 3/4] Fix Admin::Orders::CustomerDetailsControllerDecorator for zeitwerk This file has not a class defined with the same name as the filename itself. Zeitwerk does not like it. --- .../admin/orders/customer_details_controller_decorator.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb b/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb index 6a929f45..1628f53b 100644 --- a/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb +++ b/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.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 From 329f89d26dfe4b31f70e7fb2c16ac93c5acc7f03 Mon Sep 17 00:00:00 2001 From: Alberto Vena Date: Tue, 8 Oct 2019 10:55:55 +0200 Subject: [PATCH 4/4] Lock minimum Solidus version dependency to 2.6 With this PR we changed things that makes the extension no more compatible with Solidus < 2.5 and we need to reflect this in the gemspec. --- solidus_auth_devise.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_auth_devise.gemspec b/solidus_auth_devise.gemspec index e39bef52..02ce97da 100644 --- a/solidus_auth_devise.gemspec +++ b/solidus_auth_devise.gemspec @@ -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