Merge branch 'main' into chore/solidus-v.3.1.0-fix

Author: tvdeyen

.circleci/config.yml

@@ -1,5 +1,5 @@
 bump:
   recurse: false
-  file: 'lib/spree/auth/version.rb'
+  file: 'lib/solidus_auth_devise/version.rb'
   message: Bump SolidusAuthDevise to %{version}
   tag: true

.gem_release.yml

@@ -0,0 +1,2 @@
+# Ignore standardrb --fix commit
+eaba0e4370a03d10a6064466a9197c330bb92c64

.git-blame-ignore-revs

@@ -1,17 +1 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+_extends: .github

.github/stale.yml

@@ -0,0 +1,63 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 4" # every Thursday
+
+concurrency:
+  group: test-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+jobs:
+  rspec:
+    name: Solidus ${{ matrix.solidus-branch }}, Rails ${{ matrix.rails-version }} and Ruby ${{ matrix.ruby-version }} on ${{ matrix.database }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        rails-version:
+          - "7.2"
+          - "8.0"
+        ruby-version:
+          - "3.1"
+          - "3.4"
+        solidus-branch:
+          - "v4.4"
+          - "v4.5"
+          - "v4.6"
+        database:
+          - "postgresql"
+          - "mysql"
+          - "sqlite"
+        exclude:
+          - solidus-branch: "v4.5"
+            ruby-version: "3.1"
+          - solidus-branch: "v4.6"
+            ruby-version: "3.1"
+          - solidus-branch: "v4.4"
+            rails-version: "8.0"
+    env:
+      TEST_RESULTS_PATH: coverage/coverage.xml
+      CAPYBARA_JAVASCRIPT_DRIVER: selenium_headless
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run extension tests
+        uses: solidusio/test-solidus-extension@main
+        with:
+          database: ${{ matrix.database }}
+          rails-version: ${{ matrix.rails-version }}
+          ruby-version: ${{ matrix.ruby-version }}
+          solidus-branch: ${{ matrix.solidus-branch }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ env.TEST_RESULTS_PATH }}

.github/workflows/test.yml

@@ -0,0 +1,2 @@
+issues=false
+exclude-labels=infrastructure

.github_changelog_generator

@@ -15,3 +15,7 @@ pkg
 *.swp
 spec/dummy
 spec/examples.txt
+/sandbox
+.rvmrc
+.ruby-version
+.ruby-gemset

.gitignore

@@ -1,33 +1,56 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+gem "solidus", github: "solidusio/solidus", branch: branch
+gem "solidus_backend", github: "solidusio/solidus", branch: branch
 
-git "https://github.com/solidusio/solidus.git", branch: branch do
-  gem 'solidus_api'
-  gem 'solidus_backend'
-  gem 'solidus_core'
-  gem 'solidus_frontend'
-  gem 'solidus_sample'
-end
+rails_requirement_string = ENV.fetch("RAILS_VERSION", "~> 7.0")
+gem "rails", rails_requirement_string
 
-gem 'rails', ENV.fetch('RAILS_VERSION', nil)
+# The solidus_frontend gem has been pulled out since v3.2
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend"
+else
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
+end
 
-case ENV['DB']
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV.fetch("DB", nil)
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  rails_version = Gem::Requirement.new(rails_requirement_string).requirements[0][1]
+  sqlite_version = (rails_version < Gem::Version.new(7.2)) ? "~> 1.4" : "~> 2.0"
+
+  gem "sqlite3", sqlite_version
+end
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
+  # While we still support Ruby < 3 we need to workaround a limitation in
+  # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
+  # resolve gems based on the required ruby version.
+  gem "async", "< 3", require: false
 end
 
-gem 'rails-controller-testing', group: :test
+# 'net/smtp' is required by 'mail', see:
+# - https://github.com/ruby/net-protocol/issues/10
+# - https://stackoverflow.com/a/72474475
+gem "net-smtp", require: false
 
 gemspec
 
 # Use a local Gemfile to include development dependencies that might not be
-# relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
-eval_gemfile 'Gemfile-local' if File.exist? 'Gemfile-local'
+# relevant for the project or for other contributors, e.g. pry-byebug.
+#
+# We use `send` instead of calling `eval_gemfile` to work around an issue with
+# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"
+
+# Pin state_machines
+gem "state_machines", "= 0.6.0"