Fix specs with the latest version of Solidus

.circleci/config.yml

@@ -11,11 +11,15 @@ jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
-      - solidusio_extensions/run-tests
-  run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
-    steps:
-      - solidusio_extensions/run-tests
+      - checkout
+      - solidusio_extensions/dependencies
+      - run:
+          name: "Run specs on the legacy frontend"
+          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
     steps:
@@ -25,7 +29,6 @@ workflows:
   "Run specs on supported Solidus versions":
     jobs:
       - run-specs-with-postgres
-      - run-specs-with-mysql
       - lint-code
 
   "Weekly run specs against master":
@@ -38,4 +41,3 @@ workflows:
                 - master
     jobs:
       - run-specs-with-postgres
-      - run-specs-with-mysql

Gemfile

@@ -3,14 +3,9 @@
 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')
-                                      %w[solidusio/solidus solidusio/solidus_frontend]
-                                    else
-                                      %w[solidusio/solidus] * 2
-                                    end
-gem 'solidus', github: solidus_git, branch: branch
-gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
+branch = ENV.fetch('SOLIDUS_BRANCH', 'v3.3')
+gem 'solidus', git: "https://github.com/solidusio/solidus.git", branch: branch
+gem 'solidus_frontend', git: "https://github.com/solidusio/solidus_frontend.git", branch: branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

lib/generators/solidus_importer/install/install_generator.rb

@@ -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
 

lib/solidus_importer/processors/taxon.rb

@@ -42,8 +42,9 @@ 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
+        ).tap(&:validate!)
       end
 
       def tags

spec/lib/solidus_importer/processors/variant_images_spec.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

spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
+ENV['FRONTEND'] = 'none'
 
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'