solidus_dev_support 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31cfceed58aa69658323c49f71181de7221d1ac7ea38cabf2c594d1ddee9425c
-  data.tar.gz: cd3642badd5c986016ad378323fd8a60f769f3e02094a3423d2647eacc0db052
+  metadata.gz: dd75ebe4df69cf2b6d4c2e874a5deb5d93ca3c1bef800b31968efde6df303624
+  data.tar.gz: 9758dc413b673999b078062aba5bc0f775dfd9652e2a1501160b396c9daf0400
 SHA512:
-  metadata.gz: c4857c91f6144643f7e3309906a3033ec8f4657a2d4755d61ecdf7eced5d8b367d54b0f93bfdf394b4d25bd17e5b658396d9f0aec0bd539755061c7e39340948
-  data.tar.gz: 189659152c79bb73652e85c6ed2afc53ddf48cb11416d1ff8850008e3cdc8d63635391aec0dd56e8231ea930ab82725350d0fd30e984dab84053b27badd0f101
+  metadata.gz: 2db945c0e777987b64af4870bc84aa092f8ef4753bb0b6e594b0b9d42c0d0b025ae390ad7ec5b126ada636617e88bb80f58a49800fd5da72d72305194f4159a3
+  data.tar.gz: 93611280af0387fb39da8128057a12cddb231ab13b48f546384e967b1c2a65b4fdf6ddeb5e4ce75a8608315238c03cb6af7bc0aa8902b2df0fae94a9bcbce0d0

data/.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+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.2"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec rubocop -ESP

data/.github/workflows/test.yml

@@ -0,0 +1,64 @@
+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: true
+      matrix:
+        rails-version:
+          - "7.1"
+          - "7.2"
+          - "8.0"
+        ruby-version:
+          - "3.1"
+          - "3.4"
+        solidus-branch:
+          - "v4.3"
+          - "v4.4"
+          - "v4.5"
+          - "main"
+        database:
+          - "postgresql"
+          - "mysql"
+          - "sqlite"
+        exclude:
+          - rails-version: "7.2"
+            solidus-branch: "v4.3"
+          - ruby-version: "3.1"
+            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
+        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

data/Gemfile

@@ -10,8 +10,8 @@ gemspec
 branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# A workaround for https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+rails_version = ENV.fetch("RAILS_VERSION", "7.0")
+gem 'rails', "~> #{rails_version}"
 
 gem 'bundler'
 gem 'rake'
@@ -21,9 +21,13 @@ group :test do
   gem 'mysql2'
   gem 'pg'
   gem 'solidus_auth_devise'
-  gem 'sqlite3'
+  gem 'sqlite3', rails_version < '7.2' ? '~> 1.4' : '~> 2.0'
 end
 
 # 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'
+
+if rails_version == "7.0"
+  gem 'concurrent-ruby', '< 1.3.5'
+end

data/README.md

@@ -1,7 +1,7 @@
 # solidus_dev_support
 
 
-[![CircleCI](https://circleci.com/gh/solidusio/solidus_dev_support.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_dev_support)
+[![Test](https://github.com/solidusio/solidus_dev_support/actions/workflows/test.yml/badge.svg)](https://github.com/solidusio/solidus_dev_support/actions/workflows/test.yml)
 [![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support)
 
 This gem contains common development functionality for Solidus extensions.
@@ -138,10 +138,32 @@ require 'solidus_dev_support/rspec/coverage'
 **Note: Make sure to add this at the VERY TOP of your spec_helper, otherwise you'll get skewed
 coverage reports!**
 
-If your extension is in a public repo and being tested on Travis or CircleCI, there's nothing else
+If your extension is in a public repo and being tested on GitHub actions, there's nothing else
 you need to do! If your setup is more complex, look at the
 [SimpleCov](https://github.com/colszowka/simplecov)
-and [codecov-ruby](https://github.com/codecov/codecov-ruby) docs.
+and [codecov](https://about.codecov.io/language/ruby/) docs.
+
+#### Using GitHub Actions
+
+The recommended way to upload coverage reports to Codecov with GitHub Actions is to use the `solidusio/test-solidus-extension`
+workflow.
+
+```yaml
+jobs:
+  RSpec:
+    env:
+      CODECOV_COVERAGE_PATH: ./coverage/coverage.xml
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run extension tests
+        uses: solidusio/test-solidus-extension@main
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ env.CODECOV_COVERAGE_PATH }}
+```
 
 ### RuboCop configuration
 

data/lib/solidus_dev_support/rake_tasks.rb

@@ -7,14 +7,15 @@ module SolidusDevSupport
   class RakeTasks
     include Rake::DSL
 
-    def self.install(*args)
-      new(*args).tap(&:install)
+    def self.install(**args)
+      new(**args).tap(&:install)
     end
 
-    def initialize(root: Dir.pwd)
+    def initialize(root: Dir.pwd, user_class: "Spree::LegacyUser")
       @root = Pathname(root)
       @test_app_path = @root.join(ENV.fetch('DUMMY_PATH', 'spec/dummy'))
       @gemspec = Bundler.load_gemspec(@root.glob("{,*}.gemspec").first)
+      @user_class = user_class
     end
 
     attr_reader :test_app_path, :root, :gemspec
@@ -39,12 +40,12 @@ module SolidusDevSupport
         # We need to go back to the gem root since the upstream
         # extension:test_app changes the working directory to be the dummy app.
         task :test_app do
-          Rake::Task['extension:test_app'].invoke
+          Rake::Task['extension:test_app'].invoke(@user_class)
           cd root
         end
 
         directory ENV.fetch('DUMMY_PATH', nil) do
-          Rake::Task['extension:test_app'].invoke
+          Rake::Task['extension:test_app'].invoke(@user_class)
         end
       end
     end

data/lib/solidus_dev_support/rspec/coverage.rb

@@ -19,6 +19,14 @@ end
 if ENV['CODECOV_TOKEN']
   require 'codecov'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  warn <<~WARN
+    DEPRECATION WARNING: The Codecov ruby uploader is deprecated.
+    Please use the Codecov CLI uploader to upload code coverage reports.
+    See https://docs.codecov.com/docs/deprecated-uploader-migration-guide#ruby-uploader for more information on upgrading.
+  WARN
+elsif ENV['CODECOV_COVERAGE_PATH']
+  require 'simplecov-cobertura'
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 else
-  warn "Provide a CODECOV_TOKEN environment variable to enable Codecov uploads"
+  warn "Provide a CODECOV_COVERAGE_PATH environment variable to enable Codecov uploads"
 end

data/lib/solidus_dev_support/templates/extension/.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+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.2"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec rubocop -ESP

data/lib/solidus_dev_support/templates/extension/.github/workflows/test.yml

@@ -0,0 +1,71 @@
+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: true
+      matrix:
+        rails-version:
+          - "7.0"
+          - "7.1"
+          - "7.2"
+        ruby-version:
+          - "3.1"
+          - "3.4"
+        solidus-branch:
+          - "v4.1"
+          - "v4.2"
+          - "v4.3"
+          - "v4.4"
+          - "v4.5"
+        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"
+          - rails-version: "7.1"
+            solidus-branch: "v4.2"
+          - rails-version: "7.1"
+            solidus-branch: "v4.1"
+          - ruby-version: "3.4"
+            rails-version: "7.0"
+    env:
+      CODECOV_COVERAGE_PATH: ./coverage/coverage.xml
+    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.CODECOV_COVERAGE_PATH }}

data/lib/solidus_dev_support/templates/extension/Gemfile.tt

@@ -15,22 +15,25 @@ 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', '>0.a'
-
-<% if file_name != 'solidus_auth_devise' %>
-# Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
-<% end %>
+rails_version = ENV.fetch('RAILS_VERSION', '7.0')
+gem 'rails', "~> #{rails_version}"
+
 case ENV.fetch('DB', nil)
 when 'mysql'
   gem 'mysql2'
 when 'postgresql'
   gem 'pg'
 else
-  gem 'sqlite3'
+  gem 'sqlite3', rails_version < '7.2' ? '~> 1.4' : '~> 2.0'
+end
+
+if rails_version == '7.0'
+  gem 'concurrent-ruby', '< 1.3.5'
+end
+
+if RUBY_VERSION >= '3.4'
+  # Solidus Promotions uses CSV but does not have it as dependency yet.
+  gem 'csv'
 end
 
 # While we still support Ruby < 3 we need to workaround a limitation in

data/lib/solidus_dev_support/templates/extension/bin/sandbox.tt

@@ -30,7 +30,8 @@ echo "~~~> Removing the old sandbox"
 rm -rf ./sandbox
 
 echo "~~~> Creating a pristine Rails app"
-rails new sandbox \
+rails_version=`bundle exec ruby -e'require "rails"; puts Rails.version'`
+rails _${rails_version}_ new sandbox \
   --database="${DB:-sqlite3}" \
   --skip-git \
   --skip-keeps \
@@ -60,6 +61,14 @@ group :test, :development do
 end
 RUBY
 
+echo "Generating manifest file"
+mkdir -p app/assets/config
+cat <<MANIFESTJS > app/assets/config/manifest.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+MANIFESTJS
+
 unbundled bundle install --gemfile Gemfile
 
 unbundled bundle exec rake db:drop db:create

data/lib/solidus_dev_support/templates/extension/extension.gemspec.tt

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
-  spec.add_dependency 'solidus_support', '~> 0.5'
+  spec.add_dependency 'solidus_support', '>= 0.12.0'
 
   spec.add_development_dependency 'solidus_dev_support', '<%= SolidusDevSupport.gem_version.approximate_recommendation %>'
 end

data/lib/solidus_dev_support/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusDevSupport
-  VERSION = "2.9.0"
+  VERSION = "2.11.0"
 
   def self.gem_version
     Gem::Version.new(VERSION)

data/solidus_dev_support.gemspec

@@ -46,5 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubocop-rails', '~> 2.3'
   spec.add_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_dependency 'selenium-webdriver', '~> 4.11'
+  spec.add_dependency 'simplecov-cobertura', '~> 2.1'
   spec.add_dependency 'solidus_core', ['>= 2.0', '< 5']
 end

data/spec/features/create_extension_spec.rb

@@ -96,11 +96,9 @@ RSpec.describe 'Create extension' do
 
   def check_bundle_install
     cd(install_path) do
-      open('Gemfile', 'a') { |f| f.puts "gem 'solidus_dev_support', path: '../../..'" }
+      open('Gemfile', 'a') { |f| f.puts "gem 'solidus_dev_support', path: '../..'" }
     end
 
-    expect { bundle_install }.to raise_error(command_failed_error, /invalid gemspec/)
-
     # Update gemspec with the required fields
     gemspec_path = install_path.join(gemspec_name)
     gemspec = gemspec_path.read.lines
@@ -133,15 +131,13 @@ RSpec.describe 'Create extension' do
       output = sh('bundle exec rspec')
       expect(output).to include('loading test_extension factories')
       expect(output).to include('1 example, 0 failures')
-      expect(output).to include(ENV['CODECOV_TOKEN'] ? 'Coverage reports upload successfully' : 'Provide a CODECOV_TOKEN environment variable to enable Codecov uploads')
+      expect(output).to include(ENV['CODECOV_TOKEN'] ? 'Coverage reports upload successfully' : 'Provide a CODECOV_COVERAGE_PATH environment variable to enable Codecov uploads')
     end
   end
 
   def check_sandbox
     cd(install_path) do
-      # rubocop:disable Lint/InterpolationCheck
       command = 'bin/rails-sandbox runner "puts %{The version of SolidusTestExtension is #{SolidusTestExtension::VERSION}}"'
-      # rubocop:enable Lint/InterpolationCheck
 
       first_run_output = sh(command)
       expect(first_run_output).to include("Creating the sandbox app...")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Alessandro Desantis
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -266,6 +265,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.11'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +299,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-description:
 email:
 - alessandrodesantis@nebulab.it
 executables:
@@ -294,9 +306,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gem_release.yml"
 - ".github/stale.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".github_changelog_generator"
 - ".gitignore"
 - ".mergify.yml"
@@ -327,6 +340,8 @@ files:
 - lib/solidus_dev_support/solidus_command.rb
 - lib/solidus_dev_support/templates/extension/.circleci/config.yml
 - lib/solidus_dev_support/templates/extension/.github/stale.yml
+- lib/solidus_dev_support/templates/extension/.github/workflows/lint.yml
+- lib/solidus_dev_support/templates/extension/.github/workflows/test.yml
 - lib/solidus_dev_support/templates/extension/CHANGELOG.md.tt
 - lib/solidus_dev_support/templates/extension/CONTRIBUTING.md
 - lib/solidus_dev_support/templates/extension/Gemfile.tt
@@ -375,7 +390,6 @@ metadata:
   source_code_uri: https://github.com/solidusio/solidus_dev_support
   changelog_uri: https://github.com/solidusio/solidus_dev_support/releases
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,8 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Development tools for Solidus extensions.
 test_files:

data/.circleci/config.yml

@@ -1,63 +0,0 @@
-version: 2.1
-
-orbs:
-  # Always take the latest version of the orb, this allows us to
-  # run specs against Solidus supported versions only without the need
-  # to change this configuration every time a Solidus version is released
-  # or goes EOL.
-  solidusio_extensions: solidusio/extensions@volatile
-
-commands:
-  setup:
-    steps:
-      - checkout
-      - run:
-          name: "Update bundler"
-          command: |
-            sudo gem update --system
-            gem --version
-            gem install bundler -v '>=2.3.21' --conservative
-            bundle --version
-
-jobs:
-  solidus-main:
-    executor:
-      name: solidusio_extensions/sqlite
-      ruby_version: '3.2'
-    steps: ['setup', 'solidusio_extensions/run-tests-solidus-main']
-  solidus-current:
-    executor:
-      name: solidusio_extensions/sqlite
-      ruby_version: '3.1'
-    steps: ['setup', 'solidusio_extensions/run-tests-solidus-current']
-  solidus-older:
-    executor:
-      name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
-    steps: ['setup', 'solidusio_extensions/run-tests-solidus-older']
-  lint-code:
-    executor:
-      name: solidusio_extensions/sqlite
-      ruby_version: '3.1'
-    steps: ['setup', 'solidusio_extensions/lint-code']
-
-workflows:
-  "Run specs on supported Solidus versions":
-    jobs:
-      - solidus-main
-      - solidus-current
-      - solidus-older
-      - lint-code
-
-  "Weekly run specs against main":
-    triggers:
-      - schedule:
-          cron: "0 0 * * 4" # every Thursday
-          filters:
-            branches:
-              only:
-                - main
-    jobs:
-      - solidus-main
-      - solidus-current
-      - solidus-older