From 8862d07849212e7c0b4806b0a370abaaa02302ed Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Sat, 16 Nov 2019 17:45:49 +0200 Subject: [PATCH 1/6] Update versions --- Gemfile | 2 +- Versionfile | 2 +- spree_multi_tenant.gemspec | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 559e9b0..e970a7d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,6 @@ group :assets do gem 'therubyracer' end -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable' +gem 'spree_auth_devise', '~> 4.0' gemspec diff --git a/Versionfile b/Versionfile index 9b12e1f..5fc4e3c 100644 --- a/Versionfile +++ b/Versionfile @@ -1,7 +1,7 @@ # This file is used to designate compatibilty with different versions of Spree # Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details - +'2.3.x' => { :branch => '2-3-stable' } '2.2.x' => { :branch => '2-2-stable' } '2.1.x' => { :branch => '2-1-stable' } '2.0.x' => { :branch => '2-0-stable' } diff --git a/spree_multi_tenant.gemspec b/spree_multi_tenant.gemspec index c6e9437..f4aa240 100644 --- a/spree_multi_tenant.gemspec +++ b/spree_multi_tenant.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.version = '0.4.0' s.summary = 'Adds multi-tenant support to Spree' s.description = 'Allows completely separate Spree sites to be run from the same installation' - s.required_ruby_version = '>= 1.9.3' + s.required_ruby_version = '>= 2.6.5' s.author = 'Stefan Senk' # s.email = 'you@example.com' @@ -16,15 +16,15 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.2.0' + s.add_dependency 'spree_core', '~> 4.0.1' s.add_dependency 'multitenant' - s.add_development_dependency 'capybara', '~> 2.1' + s.add_development_dependency 'capybara' s.add_development_dependency 'coffee-rails' s.add_development_dependency 'database_cleaner' - s.add_development_dependency 'factory_girl', '~> 4.2' + s.add_development_dependency 'factory_girl' s.add_development_dependency 'ffaker' - s.add_development_dependency 'rspec-rails', '~> 2.13' + s.add_development_dependency 'rspec-rails' s.add_development_dependency 'sass-rails' s.add_development_dependency 'selenium-webdriver' s.add_development_dependency 'simplecov' From 6c629b97b6c521eae8aafa7decf389b7869d4afc Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Sat, 16 Nov 2019 18:22:21 +0200 Subject: [PATCH 2/6] Update rvm version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2525d25..51d9a86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.0.0 + - 2.6.5 before_script: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" From 5f95e30bb367553d407c5e72dbefecfa8f8e8cd1 Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Sat, 16 Nov 2019 18:32:32 +0200 Subject: [PATCH 3/6] Fix bug in before_script --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51d9a86..2e494dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 2.6.5 before_script: - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - 'bundle exec rake test_app' +services: + - xvfb script: 'bundle exec rspec spec' From 4b83eaee1491b12d41ad03c5be3fb0b79d0ea53b Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Sat, 16 Nov 2019 18:47:46 +0200 Subject: [PATCH 4/6] Rename Spree::AppConfiguration --- lib/spree_multi_tenant.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/spree_multi_tenant.rb b/lib/spree_multi_tenant.rb index a53d00e..7837fa5 100644 --- a/lib/spree_multi_tenant.rb +++ b/lib/spree_multi_tenant.rb @@ -9,7 +9,7 @@ def self.tenanted_models Spree::Adjustment, Spree::Asset, Spree::Calculator, - Spree::Configuration, + Spree::AppConfiguration, Spree::Country, Spree::CreditCard, Spree::Gateway, @@ -90,4 +90,3 @@ def self.with_tenant(tenant, &block) end end - From 2c585265c5c802b14f62a89780966422219cf4bf Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Fri, 22 Nov 2019 13:17:41 +0200 Subject: [PATCH 5/6] Remove TokenizedPermission model --- lib/spree_multi_tenant.rb | 1 - spree_multi_tenant.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/spree_multi_tenant.rb b/lib/spree_multi_tenant.rb index 7837fa5..3c9ae99 100644 --- a/lib/spree_multi_tenant.rb +++ b/lib/spree_multi_tenant.rb @@ -42,7 +42,6 @@ def self.tenanted_models Spree::TaxRate, Spree::Taxonomy, Spree::Taxon, - Spree::TokenizedPermission, Spree::Tracker, Spree::User, Spree::Variant, diff --git a/spree_multi_tenant.gemspec b/spree_multi_tenant.gemspec index f4aa240..c3221aa 100644 --- a/spree_multi_tenant.gemspec +++ b/spree_multi_tenant.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'capybara' s.add_development_dependency 'coffee-rails' s.add_development_dependency 'database_cleaner' - s.add_development_dependency 'factory_girl' + s.add_development_dependency 'factory_bot' s.add_development_dependency 'ffaker' s.add_development_dependency 'rspec-rails' s.add_development_dependency 'sass-rails' From 2613023d6e7129e0e476b99a08918cb9119929a5 Mon Sep 17 00:00:00 2001 From: ghaithdabash Date: Fri, 22 Nov 2019 13:24:12 +0200 Subject: [PATCH 6/6] Remove Tracker --- lib/spree_multi_tenant.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/spree_multi_tenant.rb b/lib/spree_multi_tenant.rb index 3c9ae99..e1db460 100644 --- a/lib/spree_multi_tenant.rb +++ b/lib/spree_multi_tenant.rb @@ -42,7 +42,6 @@ def self.tenanted_models Spree::TaxRate, Spree::Taxonomy, Spree::Taxon, - Spree::Tracker, Spree::User, Spree::Variant, Spree::ZoneMember,