Merge pull request #42 from kjriga/fix-github-actions-workflow

Fix Github actions test runs

Author: adammathys

.github/workflows/test.yml

@@ -19,36 +19,19 @@ jobs:
       fail-fast: true
       matrix:
         rails-version:
-          - "7.2"
-          - "8.0"
+          - "7.0"
         ruby-version:
+          - "3.1"
           - "3.2"
-          - "3.4"
+          - "3.3"
         solidus-branch:
-          - "v4.1"
-          - "v4.2"
-          - "v4.3"
-          - "v4.4"
-          - "v4.5"
+          - "v3.2"
+          - "v3.3"
+          - "v3.4"
         database:
           - "postgresql"
           - "mysql"
           - "sqlite"
-        exclude:
-          - rails-version: "7.2"
-            solidus-branch: "v4.3"
-          - rails-version: "7.2"
-            solidus-branch: "v4.2"
-          - rails-version: "7.2"
-            solidus-branch: "v4.1"
-          - ruby-version: "3.4"
-            rails-version: "7.0"
-          - ruby-version: "3.2"
-            rails-version: "8.0"
-          - solidus-branch: "v4.3"
-            rails-version: "8.0"
-          - solidus-branch: "v4.4"
-            rails-version: "8.0"
     steps:
       - uses: actions/checkout@v4
       - name: Run extension tests

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', 'v3.4')
+solidus_git, solidus_frontend_git = if (branch == 'main') || (branch == 'master') || (branch >= 'v3.2')
                                       %w[solidusio/solidus solidusio/solidus_frontend]
                                     else
                                       %w[solidusio/solidus] * 2
@@ -20,13 +20,25 @@ gem 'rails', '>0.a'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 
+# Standard library gems that became separate in Ruby 3.4+
+gem 'bigdecimal'
+gem 'mutex_m'
+gem 'drb'
+gem 'csv'
+gem 'ostruct'
+
+# This is locked due to a 'stack level too deep' error/bug in v0.1.0.
+gem 'state_machines', '~> 0.6.0'
+
+gem 'concurrent-ruby', '1.3.4'
+
 case ENV['DB']
 when 'mysql'
   gem 'mysql2'
 when 'postgresql'
   gem 'pg'
 else
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.4'
 end
 
 gemspec

Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'solidus_dev_support/rake_tasks'
 SolidusDevSupport::RakeTasks.install
 

app/decorators/models/solidus_tracking/spree/order/track_order_fulfillment.rb

@@ -4,8 +4,10 @@ module SolidusTracking
   module Spree
     module Order
       module TrackOrderFulfillment
-        def self.prepended(base)
-          base.after_update :track_fulfilled_order
+        extend ActiveSupport::Concern
+
+        prepended do
+          after_update :track_fulfilled_order
         end
 
         private

app/decorators/models/solidus_tracking/spree/order/track_order_lifecycle.rb

@@ -4,11 +4,13 @@ module SolidusTracking
   module Spree
     module Order
       module TrackOrderLifecycle
-        def self.prepended(base)
-          base.state_machine.after_transition to: :address, do: :track_started_checkout
-          base.state_machine.after_transition to: :complete, do: :track_ordered_product
-          base.state_machine.after_transition to: :complete, do: :track_placed_order
-          base.state_machine.after_transition to: :canceled, do: :track_cancelled_order
+        extend ActiveSupport::Concern
+
+        prepended do
+          state_machine.after_transition to: :address, do: :track_started_checkout
+          state_machine.after_transition to: :complete, do: :track_ordered_product
+          state_machine.after_transition to: :complete, do: :track_placed_order
+          state_machine.after_transition to: :canceled, do: :track_cancelled_order
         end
 
         private

app/decorators/models/solidus_tracking/spree/user/track_signup.rb

@@ -4,8 +4,10 @@ module SolidusTracking
   module Spree
     module User
       module TrackSignup
-        def self.prepended(base)
-          base.after_commit :track_signup, on: :create
+        extend ActiveSupport::Concern
+
+        prepended do
+          after_commit :track_signup, on: :create
         end
 
         private

spec/solidus_tracking/event/cancelled_order_spec.rb

@@ -49,7 +49,7 @@
     end
 
     it 'includes an event ID and value' do
-      order = build_stubbed(:order)
+      order = create(:order)
       allow(SolidusTracking::Serializer::LineItem).to receive(:serialize)
         .with(order)
         .and_return('foo' => 'bar')

spec/solidus_tracking/event/fulfilled_order_spec.rb

@@ -49,7 +49,7 @@
     end
 
     it 'includes an event ID and value' do
-      order = build_stubbed(:order)
+      order = create(:order)
       allow(SolidusTracking::Serializer::LineItem).to receive(:serialize)
         .with(order)
         .and_return('foo' => 'bar')

spec/solidus_tracking/event/placed_order_spec.rb

@@ -49,7 +49,7 @@
     end
 
     it 'includes an event ID and value' do
-      order = build_stubbed(:order)
+      order = create(:order)
       allow(SolidusTracking::Serializer::LineItem).to receive(:serialize)
         .with(order)
         .and_return('foo' => 'bar')

spec/solidus_tracking/event/started_checkout_spec.rb

@@ -49,7 +49,7 @@
     end
 
     it 'includes an event ID and value' do
-      order = build_stubbed(:order)
+      order = create(:order)
       allow(SolidusTracking::Serializer::LineItem).to receive(:serialize)
         .with(order)
         .and_return('foo' => 'bar')