solidus_dev_support 2.6.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf66be08fc8080f6c64bfd58e1f81ebe5c66aa72d6473146a7fa0ff1ad68e9b
-  data.tar.gz: 6f1fe3ec075e8ec5935a336eeedc78974262945cca8eb38e831518e062104d60
+  metadata.gz: 33b0d8ce068309192e7131a9b14ba4f4a4aaa0f26437b6f7f7acb67f108435c2
+  data.tar.gz: b9050730ef761e1822f3f6a7544093f43fe3c3d53b0d7687b44bd2085f9924b0
 SHA512:
-  metadata.gz: 15433d4424d7fb44d65be238ddc4240ffb82201b32ed4c94d46ce418ef3fbeda26d84f328750996e57afc12e5a24f515f6fd98aaaa5cb4191f62d199bbd266f4
-  data.tar.gz: 3c0fed4e30d243ad9a99ad4e17abe9db1e2978c1c1d90190e636a07355b2eca5a49b938b9998dec1a0126c72101f6360b84e96c814db9ef9a04fd07337fab968
+  metadata.gz: 5dc1178e3a826f16d81b31af688b4213ed3c47aa65dcc18c24678be64c5726db7df0272a5688a80188ac953bcc9c8b8b81bfa9bc03fe0f926467f304e301e494
+  data.tar.gz: 47748cc87caf9a9e768d706148a647d5f64da8a80df73db13ffd851fc2313eee90e3a73bf3c22b8314c0414d541eca657adcd6928c448740a1af6d21a43430af

data/.circleci/config.yml

@@ -20,44 +20,44 @@ commands:
             bundle --version
 
 jobs:
-  solidus-master:
+  solidus-main:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.1'
-    steps: ['setup', 'solidusio_extensions/run-tests-solidus-master']
+      ruby_version: '3.2'
+    steps: ['setup', 'solidusio_extensions/run-tests-solidus-main']
   solidus-current:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-current']
   solidus-older:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '2.7'
+      ruby_version: '3.0'
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-older']
   lint-code:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps: ['setup', 'solidusio_extensions/lint-code']
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - solidus-master
+      - solidus-main
       - solidus-current
       - solidus-older
       - lint-code
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
-      - solidus-master
+      - solidus-main
       - solidus-current
       - solidus-older

data/.mergify.yml

@@ -1,7 +1,7 @@
 pull_request_rules:
   - name: request changelog labels when a PR is missing them
     conditions:
-      - base=master
+      - base=main
       - -label=bug
       - -label=enhancement
       - -label=documentation
@@ -31,7 +31,7 @@ pull_request_rules:
           Once the correct labels have been set, simply remove the `needs changelog label` label from this PR so I can merge it.
   - name: merge PRs automatically
     conditions:
-      - base=master
+      - base=main
       - -label="needs changelog label"
       - -label=blocked
       - "#approved-reviews-by>=1"

data/Gemfile

@@ -7,7 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in solidus_dev_support.gemspec
 gemspec
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
 # A workaround for https://github.com/bundler/bundler/issues/6677

data/README.md

@@ -2,7 +2,7 @@
 
 
 [![CircleCI](https://circleci.com/gh/solidusio/solidus_dev_support.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_dev_support)
-[![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support)
+[![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.
 
@@ -78,7 +78,7 @@ the `DB` and `SOLIDUS_BRANCH` env variables.
 DB=[postgres|mysql|sqlite] SOLIDUS_BRANCH=<BRANCH-NAME> bin/sandbox
 ```
 
-By default we use sqlite3 and the master branch.
+By default we use sqlite3 and the main branch.
 
 ### Rails generators
 
@@ -192,7 +192,7 @@ The above command will:
 
 * bump the gem version to the next minor (you can also use `patch`, `major` or a specific version
   number);
-* commit the change and push it to `origin/master`;
+* commit the change and push it to `origin/main`;
 * create a Git tag;
 * push the tag to the `origin` remote;
 * release the new version on RubyGems.
@@ -234,15 +234,9 @@ experiment.
 
 To install this gem onto your local machine, run `bin/rake install`.
 
-To release a new version:
+### Releasing new versions
 
-1. update the version number in `version.rb`
-2. update the changelog with `bin/rake changelog`
-3. commit the changes using `Release SolidusDevSupport v1.2.3` as the message
-3. run `bin/rake release`
-
-The last command will create a git tag for the version, push git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+Please use the same process suggested for extensions in the [dedicated page](https://github.com/solidusio/solidus/wiki/How-to-release-extensions) in the Solidus wiki.
 
 ## Contributing
 

data/lib/solidus_dev_support/extension.rb

@@ -79,7 +79,7 @@ module SolidusDevSupport
           gem.license = 'BSD-3-Clause'
 
           gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme"
-          gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/master/CHANGELOG.md"
+          gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/main/CHANGELOG.md"
           gem.metadata['source_code_uri'] = "https://github.com/#{repo}"
         end
       end

data/lib/solidus_dev_support/rake_tasks.rb

@@ -83,7 +83,6 @@ module SolidusDevSupport
         config.user = repo.owner
         config.project = repo.name
         config.future_release = "v#{ENV.fetch('UNRELEASED_VERSION') { gemspec.version }}"
-
       rescue Octokit::InvalidRepository
         warn <<~WARN
           It won't be possible to automatically generate the CHANGELOG for this extension because the

data/lib/solidus_dev_support/rspec/capybara.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'webdrivers/chromedriver'
-
 # Allow to override the initial windows size
 CAPYBARA_WINDOW_SIZE = ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080').split('x', 2).map(&:to_i)
 CAPYBARA_WINDOW_WIDTH = CAPYBARA_WINDOW_SIZE[0]

data/lib/solidus_dev_support/templates/extension/.circleci/config.yml

@@ -39,14 +39,14 @@ workflows:
       - run-specs-with-mysql
       - lint-code
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - run-specs-with-sqlite
       - run-specs-with-postgres

data/lib/solidus_dev_support/templates/extension/CHANGELOG.md.tt

@@ -0,0 +1,3 @@
+# Changelog
+
+See https://github.com/<%=default_repo%>/releases or OLD_CHANGELOG.md for older versions.

data/lib/solidus_dev_support/templates/extension/CONTRIBUTING.md

@@ -16,13 +16,13 @@ follow so that we can have a chance of keeping on top of things.
 ## Making Changes
 
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
+  * This is usually the main branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
-    `master` branch.
+  * To quickly create a topic branch based on main; `git branch
+    fix/main/my_contribution main` then checkout the new branch with `git
+    checkout fix/main/my_contribution`.  Please avoid working directly on the
+    `main` branch.
 * Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the proper format.

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

@@ -3,12 +3,17 @@
 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
 
 # The solidus_frontend gem has been pulled out since v3.2
-gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
-gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
+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
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

data/lib/solidus_dev_support/templates/extension/README.md

@@ -1,7 +1,7 @@
 # <%= class_name.gsub(/(?<=[^A-Z])([A-Z])/, ' \1') %>
 
 [![CircleCI](https://circleci.com/gh/<%= repo %>.svg?style=shield)](https://circleci.com/gh/<%= repo %>)
-[![codecov](https://codecov.io/gh/<%= repo %>/branch/master/graph/badge.svg)](https://codecov.io/gh/<%= repo %>)
+[![codecov](https://codecov.io/gh/<%= repo %>/branch/main/graph/badge.svg)](https://codecov.io/gh/<%= repo %>)
 
 <!-- Explain what your extension does. -->
 

data/lib/solidus_dev_support/templates/extension/Rakefile

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

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

@@ -5,48 +5,51 @@ test -z "${DEBUG+empty_string}" || set -x
 
 test "$DB" = "sqlite" && export DB="sqlite3"
 
-if [ -z "$SOLIDUS_BRANCH" ]
+if [ -z "$PAYMENT_METHOD" ]
 then
-  echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
-  SOLIDUS_BRANCH="master"
+  PAYMENT_METHOD="none"
 fi
-echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
 
-if [ -z "$SOLIDUS_FRONTEND" ]
+if [ -z "$SOLIDUS_BRANCH" ]
 then
-  echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend"
-  SOLIDUS_FRONTEND="solidus_frontend"
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v4.0|...]' to control the Solidus branch"
+  SOLIDUS_BRANCH="main"
 fi
-echo "~~> Using branch $SOLIDUS_FRONTEND as the solidus frontend"
+echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
 
 extension_name="<%= file_name %>"
 
 # 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 \
+
+echo "~~~> Creating a pristine Rails app"
+rails new sandbox \
   --database="${DB:-sqlite3}" \
-  --skip-bundle \
   --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: '$SOLIDUS_BRANCH'
 gem 'rails-i18n'
 gem 'solidus_i18n'
+gem 'solidus_auth_devise'
 
 gem '$extension_name', path: '..'
 
@@ -63,11 +66,6 @@ unbundled bundle exec rake db:drop db:create
 
 unbundled bundle exec rails generate solidus:install \
   --auto-accept \
-  --user_class=Spree::User \
-  --enforce_available_locales=true \
-  --with-authentication=<%= file_name != 'solidus_auth_devise' %> \
-  --payment-method=none \
-  --frontend=${SOLIDUS_FRONTEND} \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations

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

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
   spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'solidus_dev_support', '<%= SolidusDevSupport.gem_version.approximate_recommendation %>'

data/lib/solidus_dev_support/testing_support/factories.rb

@@ -8,7 +8,7 @@ module SolidusDevSupport
     module Factories
       def self.load_for(*engines)
         paths = engines.flat_map do |engine|
-          engine.root.glob('lib/*/testing_support/factories{,.rb}')
+          engine.root.glob('lib/**/testing_support/factories{,.rb}')
         end.map { |path| path.sub(/.rb\z/, '').to_s }
 
         FactoryBot.definition_file_paths = [

data/lib/solidus_dev_support/version.rb

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

data/solidus_dev_support.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_dev_support/releases'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara', '~> 3.29'
   spec.add_dependency 'capybara-screenshot', '~> 1.0'
   spec.add_dependency 'codecov', '~> 0.2'
-  spec.add_dependency 'database_cleaner', '~> 1.7'
+  spec.add_dependency 'database_cleaner', ['>= 1.7', '< 3']
   spec.add_dependency 'factory_bot', '>= 4.8'
   spec.add_dependency 'factory_bot_rails'
   spec.add_dependency 'ffaker', '~> 2.13'
@@ -45,6 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubocop-performance', '~> 1.5'
   spec.add_dependency 'rubocop-rails', '~> 2.3'
   spec.add_dependency 'rubocop-rspec', '~> 2.0'
+  spec.add_dependency 'selenium-webdriver', '~> 4.11'
   spec.add_dependency 'solidus_core', ['>= 2.0', '< 5']
-  spec.add_dependency 'webdrivers', '>= 4.4'
 end

data/spec/lib/extension_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe SolidusDevSupport::Extension do
         expect(subject.gemspec.description).to eq('TODO: Write a longer description or delete this line.')
         expect(subject.gemspec.license).to eq('BSD-3-Clause')
         expect(subject.gemspec.homepage).to eq("https://github.com/solidusio-contrib/solidus_my_ext#readme")
-        expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/master/CHANGELOG.md")
+        expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/main/CHANGELOG.md")
         expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -56,16 +56,22 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -247,39 +253,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description:
 email:
 - alessandrodesantis@nebulab.it
@@ -321,7 +327,7 @@ 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/CHANGELOG.md
+- 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
 - lib/solidus_dev_support/templates/extension/LICENSE
@@ -377,14 +383,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Development tools for Solidus extensions.

data/lib/solidus_dev_support/templates/extension/CHANGELOG.md

@@ -1 +0,0 @@
-# Changelog