Merge pull request #98 from bcarreno/master

Fix spec failures & support Solidus 4

Author: jarednorman

.circleci/config.yml

@@ -9,15 +9,37 @@ orbs:
 
 jobs:
   run-specs-with-postgres:
-    executor: solidusio_extensions/postgres
+    executor:
+      name: solidusio_extensions/postgres
+      ruby_version: '3.0'
     steps:
-      - solidusio_extensions/run-tests
+      - checkout
+      - solidusio_extensions/dependencies
+      - run:
+          name: "Run specs on the legacy frontend with postgres"
+          command: export FRONTEND=solidus_frontend
+      - solidusio_extensions/test-branch:
+          branch: v3.3
+          rails_version: '~> 7.0'
+      - solidusio_extensions/store-test-results
   run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
+    executor:
+      name: solidusio_extensions/mysql
+      ruby_version: '3.0'
     steps:
-      - solidusio_extensions/run-tests
+      - checkout
+      - solidusio_extensions/dependencies
+      - run:
+          name: "Run specs on the legacy frontend with mysql"
+          command: export FRONTEND=solidus_frontend
+      - solidusio_extensions/test-branch:
+          branch: v3.3
+          rails_version: '~> 7.0'
+      - solidusio_extensions/store-test-results
   lint-code:
-    executor: solidusio_extensions/sqlite-memory
+    executor:
+      name: solidusio_extensions/sqlite-memory
+      ruby_version: '3.0'
     steps:
       - solidusio_extensions/lint-code
 

Gemfile

@@ -3,8 +3,8 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+solidus_git, solidus_frontend_git = if (branch == 'main') || (branch >= 'v3.2')
                                       %w[solidusio/solidus solidusio/solidus_frontend]
                                     else
                                       %w[solidusio/solidus] * 2

app/assets/javascripts/spree/frontend/solidus_importer.js

@@ -11,12 +11,10 @@ def copy_initializer
       end
 
       def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_importer\n"
         append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_importer\n"
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_importer\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
         inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_importer\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
       end
 

app/assets/stylesheets/spree/frontend/solidus_importer.css

@@ -42,7 +42,8 @@ def add_taxon(taxon)
       def prepare_taxon(name, taxonomy)
         Spree::Taxon.find_or_initialize_by(
           name: name,
-          taxonomy_id: taxonomy.id
+          taxonomy_id: taxonomy.id,
+          parent: taxonomy.root
         )
       end
 

lib/generators/solidus_importer/install/install_generator.rb

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
   spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'solidus_dev_support', '~> 2.4'

lib/solidus_importer/processors/taxon.rb

@@ -32,7 +32,7 @@
       let(:context) do
         {
           data: { 'Variant Image' => 'http://remote-service.net/thinking-cat.jpg' },
-          variant: build_stubbed(:variant)
+          variant: create(:variant)
         }
       end
       let(:uri) do