From 225ca69bf286765564c20732e8cd34fb36237c4e Mon Sep 17 00:00:00 2001 From: earllevine Date: Sat, 29 Apr 2023 13:30:56 -0700 Subject: [PATCH] Change for Spree version 4.5.x --- .ruby-version | 2 +- Gemfile | 11 ++++++----- lib/spree_multi_tenant.rb | 11 +++++++++-- spec/models/preferences_spec.rb | 8 ++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index a603bb5..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +3.2.2 diff --git a/Gemfile b/Gemfile index 6e5c938..f1d62f9 100644 --- a/Gemfile +++ b/Gemfile @@ -5,12 +5,12 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'spree_core', '4.4.0' -gem 'spree_backend', '4.4.0' -gem 'spree_frontend', git: 'https://github.com/spree/spree_legacy_frontend.git', ref: 'c81ce5c' -gem 'spree_emails', '4.4.0' +gem 'spree_core', '4.5.0' +gem 'spree_backend', '4.5.0' +gem 'spree_frontend', '4.5.0' +gem 'spree_emails', '4.5.0' # Provides basic authentication functionality for testing parts of your engine -gem 'spree_auth_devise', '4.4.2' +gem 'spree_auth_devise', '4.5.0' gem 'rails-controller-testing' gem 'sqlite3', '~> 1.4' @@ -21,6 +21,7 @@ gem 'rubocop-rspec', require: false group :test do gem 'pg' gem 'redis', '4.4.0' + gem 'email_spec', '2.2.1' end gemspec diff --git a/lib/spree_multi_tenant.rb b/lib/spree_multi_tenant.rb index 5699945..475c488 100644 --- a/lib/spree_multi_tenant.rb +++ b/lib/spree_multi_tenant.rb @@ -111,22 +111,29 @@ def self.tenanted_models [ 'Spree::CmsPage', 'Spree::CmsSection', + 'Spree::Digital', + 'Spree::DigitalLink', 'Spree::Menu', 'Spree::MenuItem', + 'Spree::PaymentSource', 'Spree::StoreProduct', + 'Spree::Tag', 'Spree::User', - 'Spree::Tag' + 'Spree::Webhooks::Event', + 'Spree::Webhooks::Subscriber', + 'Spree::WishedItem', + 'Spree::Wishlist' ].map(&:safe_constantize).compact end def self.tenanted_controllers [ Spree::BaseController, - Spree::Api::BaseController, Spree::Api::V2::BaseController ] + [ 'Spree::Admin::BaseController', + 'Spree::Api::BaseController', 'Spree::StoreController', 'Spree::UserPasswordsController', 'Spree::UserSessionsController', diff --git a/spec/models/preferences_spec.rb b/spec/models/preferences_spec.rb index 8a315cc..28c42bc 100644 --- a/spec/models/preferences_spec.rb +++ b/spec/models/preferences_spec.rb @@ -29,19 +29,19 @@ @tenant2 = FactoryBot.create(:tenant) SpreeMultiTenant.with_tenant @tenant1 do - Spree::Api::Config[:requires_authentication] = true + Spree::Api::Config[:api_v2_per_page_limit] = 1 end SpreeMultiTenant.with_tenant @tenant2 do - Spree::Api::Config[:requires_authentication] = false + Spree::Api::Config[:api_v2_per_page_limit] = 2 end end it "should have the right preference for the tenant" do SpreeMultiTenant.with_tenant @tenant1 do - Spree::Api::Config.requires_authentication.should == true + Spree::Api::Config.api_v2_per_page_limit.should == 1 end SpreeMultiTenant.with_tenant @tenant2 do - Spree::Api::Config.requires_authentication.should == false + Spree::Api::Config.api_v2_per_page_limit.should == 2 end end end