bundle exec solidus extension .

jarednorman · jarednorman · commit ff395aa16fbe · 2026-02-04T09:41:03.000-08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,53 @@
+version: 2.1
+
+orbs:
+  # Required for feature specs.
+  browser-tools: circleci/browser-tools@1.1
+
+  # 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
+
+jobs:
+  run-specs-with-sqlite:
+    executor: solidusio_extensions/sqlite
+    steps:
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests
+  lint-code:
+    executor: solidusio_extensions/sqlite-memory
+    steps:
+      - solidusio_extensions/lint-code
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-sqlite
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+      - lint-code
+
+  "Weekly run specs against main":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      - run-specs-with-sqlite
+      - run-specs-with-postgres
+      - run-specs-with-mysql
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -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: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# 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 might 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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,6 +34,7 @@ jobs:
           - "v4.2"
           - "v4.3"
           - "v4.4"
+          - "v4.5"
         database:
           - "postgresql"
           - "mysql"
@@ -52,7 +53,7 @@ jobs:
           - ruby-version: "3.4"
             rails-version: "7.0"
     env:
-      TEST_RESULTS_PATH: coverage/coverage.xml
+      CODECOV_COVERAGE_PATH: ./coverage/coverage.xml
     steps:
       - uses: actions/checkout@v4
       - name: Run extension tests
@@ -67,4 +68,4 @@ jobs:
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ env.TEST_RESULTS_PATH }}
+          files: ${{ env.CODECOV_COVERAGE_PATH }}
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,15 +1,5 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - solidus_dev_support/rubocop
 
-RSpec/DescribeClass:
-  Exclude:
-    - spec/requests/**/*
-    - spec/features/**/*
-
-Rails/SkipsModelValidations:
-  Enabled: false
-
 AllCops:
   NewCops: disable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Changelog
 
-See https://github.com/solidusio/solidus_subscriptions/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.
+See https://github.com/solidusio/solidus_subscriptions/releases or OLD_CHANGELOG.md for older versions.
diff --git a/Gemfile b/Gemfile
@@ -7,24 +7,40 @@ branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
-gem 'solidus_frontend'
+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
 
-rails_version = ENV.fetch('RAILS_VERSION', '7.2')
+rails_version = ENV.fetch('RAILS_VERSION', '7.0')
 gem 'rails', "~> #{rails_version}"
 
-case ENV['DB']
+case ENV.fetch('DB', nil)
 when 'mysql'
   gem 'mysql2'
 when 'postgresql'
   gem 'pg'
 else
-  if rails_version <= "7.2"
-    gem 'sqlite3', "~> 1.7"
-  else
-    gem 'sqlite3', "~> 2.0"
-  end
+  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
+# the 'async' gem that relies on the latest ruby, since RubyGems doesn't
+# resolve gems based on the required ruby version.
+gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+
 gemspec
 
 # Use a local Gemfile to include development dependencies that might not be
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Stembolt
+Copyright (c) 2026 Solidus Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/app/assets/javascripts/spree/frontend/solidus_subscriptions.js b/app/assets/javascripts/spree/frontend/solidus_subscriptions.js
@@ -0,0 +1,2 @@
+// Placeholder manifest file.
+// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'
diff --git a/app/assets/stylesheets/spree/backend/solidus_subscriptions.css b/app/assets/stylesheets/spree/backend/solidus_subscriptions.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
+*/
diff --git a/app/assets/stylesheets/spree/frontend/solidus_subscriptions.css b/app/assets/stylesheets/spree/frontend/solidus_subscriptions.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
+*/
diff --git a/bin/rails-sandbox b/bin/rails-sandbox
@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 
-app_root = 'sandbox'
+app_root = "sandbox"
 
 unless File.exist? "#{app_root}/bin/rails"
-  warn 'Creating the sandbox app...'
+  warn "Creating the sandbox app..."
   Dir.chdir "#{__dir__}/.." do
     system "#{__dir__}/sandbox" or begin
-      warn 'Automatic creation of the sandbox app failed'
+      warn "Automatic creation of the sandbox app failed"
       exit 1
     end
   end
 end
 
 Dir.chdir app_root
-exec 'bin/rails', *ARGV
+exec "bin/rails", *ARGV
diff --git a/bin/sandbox b/bin/sandbox
@@ -1,57 +1,56 @@
 #!/usr/bin/env bash
 
 set -e
+test -z "${DEBUG+empty_string}" || set -x
 
-case "$DB" in
-postgres|postgresql)
-  RAILSDB="postgresql"
-  ;;
-mysql)
-  RAILSDB="mysql"
-  ;;
-sqlite|'')
-  RAILSDB="sqlite3"
-  ;;
-*)
-  echo "Invalid DB specified: $DB"
-  exit 1
-  ;;
-esac
+test "$DB" = "sqlite" && export DB="sqlite3"
+
+if [ -z "$PAYMENT_METHOD" ]
+then
+  PAYMENT_METHOD="none"
+fi
 
-if [ ! -z $SOLIDUS_BRANCH ]
+if [ -z "$SOLIDUS_BRANCH" ]
 then
-  BRANCH=$SOLIDUS_BRANCH
-else
-  BRANCH="main"
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v4.0|...]' to control the Solidus branch"
+  SOLIDUS_BRANCH="main"
 fi
+echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
 
 extension_name="solidus_subscriptions"
 
 # Stay away from the bundler env of the containing extension.
 function unbundled {
-  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+  ruby -rbundler -e'
+      Bundler.with_unbundled_env {system *ARGV}' -- \
+        env BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES=true $@
 }
 
+echo "~~~> Removing the old sandbox"
 rm -rf ./sandbox
-unbundled bundle exec rails new sandbox --database="$RAILSDB" \
-  --skip-bundle \
+
+echo "~~~> Creating a pristine Rails app"
+rails_version=`bundle exec ruby -e'require "rails"; puts Rails.version'`
+rails _${rails_version}_ new sandbox \
+  --database="${DB:-sqlite3}" \
   --skip-git \
   --skip-keeps \
   --skip-rc \
-  --skip-spring \
-  --skip-test \
-  --skip-javascript
+  --skip-bootsnap \
+  --skip-test
 
 if [ ! -d "sandbox" ]; then
   echo 'sandbox rails application failed'
   exit 1
 fi
 
+echo "~~~> Adding solidus (with i18n) to the Gemfile"
 cd ./sandbox
 cat <<RUBY >> Gemfile
-gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
+gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
 gem 'rails-i18n'
 gem 'solidus_i18n'
+gem 'solidus_auth_devise'
 
 gem '$extension_name', path: '..'
 
@@ -62,20 +61,25 @@ 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
 
 unbundled bundle exec rails generate solidus:install \
   --auto-accept \
-  --payment-method=none \
   $@
 
-unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations=true
+unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations
+unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"
-echo "🚀 Using $RAILSDB and Solidus $BRANCH"
-echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
-echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
-echo "🚀 This app is intended for test purposes."
+echo "🧪 This app is intended for test purposes."
diff --git a/lib/solidus_subscriptions/testing_support/factories.rb b/lib/solidus_subscriptions/testing_support/factories.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -18,6 +18,8 @@
 # in spec/support/ and its subdirectories.
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
+# Requires factories defined in Solidus core and this extension.
+# See: lib/solidus_subscriptions/testing_support/factories.rb
 SolidusDevSupport::TestingSupport::Factories.load_for(SolidusSubscriptions::Engine)
 
 RSpec.configure do |config|

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Changelog`
`2`	`2`
`3`		`-See https://github.com/solidusio/solidus_subscriptions/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.`
	`3`	`+See https://github.com/solidusio/solidus_subscriptions/releases or OLD_CHANGELOG.md for older versions.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2016 Stembolt`
	`1`	`+Copyright (c) 2026 Solidus Team`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without modification,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Placeholder manifest file.`
	`2`	`+// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +/*
 +Placeholder manifest file.
 +the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
 +*/