Merge pull request #18 from SuperGoodSoft/alistair/fix-ci

Update CI to Actions, use standard, fix issues related to newer Rails versions

Author: jarednorman

.circleci/config.yml

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Convert to standardrb
+0bc0e15a823ecbbf28a7c09825c4330f37f88ccb

.git-blame-ignore-revs

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
+
+permissions:
+  contents: read
+
+jobs:
+  ruby:
+    name: Check Ruby
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec standardrb

.github/workflows/lint.yml

@@ -0,0 +1,49 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 4" # every Thursday
+concurrency:
+  group: test-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
+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: true
+      matrix:
+        rails-version:
+          - "7.2"
+          - "8.0"
+        ruby-version:
+          - "3.3"
+          - "3.4"
+        solidus-branch:
+          - "v4.4"
+          - "v4.5"
+          - "v4.6"
+        database:
+          - "postgresql"
+          - "mysql"
+          - "sqlite"
+    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: ./coverage/coverage.xml

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 require:
-  - solidus_dev_support/rubocop
+  - standard
 
-RSpec/MultipleMemoizedHelpers:
-  Enabled: false
+inherit_gem:
+  standard: config/base.yml

.rubocop.yml

@@ -0,0 +1,5 @@
+parallel: true # default: false
+format: progress # default: Standard::Formatter
+ignore:
+  - 'vendor/**/*'
+  - 'sandbox/**/*'

.standard.yml

@@ -1,32 +1,41 @@
 # 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')
-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", "main"
+
+gem "solidus", github: "solidusio/solidus", branch: branch
+
+# The `solidus_frontend` gem is deprecated and isn't expected to have major
+# version updates after v3.2.
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend", branch: branch
+else
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
+end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '~> 6.0'
+rails_requirement_string = ENV.fetch("RAILS_VERSION", "~> 8.0")
+gem "rails", rails_requirement_string
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
+gem "solidus_auth_devise"
 
-case ENV['DB']
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV["DB"]
+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
 
 gemspec
@@ -36,4 +45,4 @@ gemspec
 #
 # 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'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"

Gemfile

@@ -193,10 +193,10 @@ bundle
 bin/rake
 ```
 
-To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
+To run [Standard](https://github.com/standardrb/standard)
 
 ```shell
-bundle exec rubocop
+bundle exec standardrb --fix
 ```
 
 When testing your application's integration with this extension you may use its factories.

README.md

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'solidus_dev_support/rake_tasks'
+require "solidus_dev_support/rake_tasks"
 SolidusDevSupport::RakeTasks.install
 
-task default: 'extension:specs'
+task default: "extension:specs"

Rakefile

@@ -35,7 +35,7 @@ def confirm
                 amount: affirm_transaction_object.amount / 100.0
               }
             )
-            order.next! unless order.state == 'confirm'
+            order.next! unless order.state == "confirm"
             redirect_to checkout_state_path(order.state)
           end
         end