solidus_dev_support 2.5.2 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e98ad4f08c0abe09fd5c4a86640e25db13f003324dcbd0ca1dc8e8747dcfd35b
-  data.tar.gz: 76ac684f40e4615ed1cad8a91c0f1140416e4009ad0e2ddd61986d05a04703e5
+  metadata.gz: fe379e7fb130ab58c9441d18cae3d9c0eb6041c112db22497d93d170f4670267
+  data.tar.gz: 0a2bbcd253dd04a0b76723aa46279c68a0d2596c57fb7dc197c89bc4b8d50e16
 SHA512:
-  metadata.gz: 075e9de0887997b6893354aa756a720b82e8cad4f15bbaf59face03658b1a3259360aff1d6b25850d9ea37365dc81e12321b69ed6130b4919384df8ac1b79a9c
-  data.tar.gz: 8b9432063e8147d83bc856961d8404b140bedc8a921137ba3db8f04542e1d18bfcf87a31f7bcba516a76adc4e977d0bcde8698568945f60e51bd114aaf3631ee
+  metadata.gz: 16934e61453c2437bf129eaaa4ffb91927ccb811d5325490da187ede88a8d14c956e3e9d44bfb2b358f745036b4fdeced91a20884467e6bf2e3899222f72fae5
+  data.tar.gz: 31090179be805e26f804ee26e7fb3ac70865d73105087777e2485961ddfed1a41c6ce48d32c7e4b1cceb45796cb5a2e189099756665228301196b73c13212a9d

data/.circleci/config.yml

@@ -12,21 +12,25 @@ commands:
     steps:
       - checkout
       - run:
-          command: "gem install bundler -v '>=2' --conservative"
-          no_output_timeout: 20m
+          name: "Update bundler"
+          command: |
+            sudo gem update --system
+            gem --version
+            gem install bundler -v '>=2.3.21' --conservative
+            bundle --version
 
 jobs:
   solidus-master:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-master']
   solidus-current:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-current']
   solidus-older:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-older']
   lint-code:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/lint-code']
 
 workflows:

data/.rubocop.yml

@@ -36,6 +36,11 @@ Style/RedundantRegexpEscape:
 Style/SlicingWithRange:
   Enabled: true
 
+# Disable this cop until this isssue gets a clear answer:
+# https://github.com/rubocop/rubocop/issues/10675
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:

data/CHANGELOG.md

@@ -1,8 +1,30 @@
 # Changelog
 
-## [2.5.2](https://github.com/solidusio/solidus_dev_support/tree/2.5.2) (2021-11-23)
+## [2.5.5](https://github.com/solidusio/solidus_dev_support/tree/2.5.5) (2022-09-08)
 
-[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.5.1...2.5.2)
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.5.4...2.5.5)
+
+**Implemented enhancements:**
+
+- Configure solidus\_chrome\_headless as capybara-screenshot driver [\#190](https://github.com/solidusio/solidus_dev_support/pull/190) ([tvdeyen](https://github.com/tvdeyen))
+- Misc: auth-devise, extracted frontend gem, sqlite [\#188](https://github.com/solidusio/solidus_dev_support/pull/188) ([elia](https://github.com/elia))
+
+**Fixed bugs:**
+
+- Revert temporary fix for Octokit [\#186](https://github.com/solidusio/solidus_dev_support/pull/186) ([waiting-for-dev](https://github.com/waiting-for-dev))
+
+## [v2.5.4](https://github.com/solidusio/solidus_dev_support/tree/v2.5.4) (2022-05-31)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.5.2...v2.5.4)
+
+**Fixed bugs:**
+
+- Add a missing require for octokit/repository [\#185](https://github.com/solidusio/solidus_dev_support/pull/185) ([elia](https://github.com/elia))
+- Fix window resizing of `solidus_chrome_headless` driver  [\#184](https://github.com/solidusio/solidus_dev_support/pull/184) ([gsmendoza](https://github.com/gsmendoza))
+
+## [v2.5.2](https://github.com/solidusio/solidus_dev_support/tree/v2.5.2) (2021-11-23)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.5.1...v2.5.2)
 
 **Merged pull requests:**
 

data/lib/solidus_dev_support/rake_tasks.rb

@@ -13,7 +13,7 @@ module SolidusDevSupport
 
     def initialize(root: Dir.pwd)
       @root = Pathname(root)
-      @test_app_path = @root.join(ENV['DUMMY_PATH'] || 'spec/dummy')
+      @test_app_path = @root.join(ENV.fetch('DUMMY_PATH', 'spec/dummy'))
       @gemspec = Bundler.load_gemspec(@root.glob("{,*}.gemspec").first)
     end
 
@@ -43,7 +43,7 @@ module SolidusDevSupport
           cd root
         end
 
-        directory ENV['DUMMY_PATH'] do
+        directory ENV.fetch('DUMMY_PATH', nil) do
           Rake::Task['extension:test_app'].invoke
         end
       end
@@ -61,7 +61,7 @@ module SolidusDevSupport
       require 'rspec/core/rake_task'
 
       namespace :extension do
-        ::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV['DUMMY_PATH']]) do |t|
+        ::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV.fetch('DUMMY_PATH', nil)]) do |t|
           # Ref: https://circleci.com/docs/2.0/configuration-reference#store_test_results
           # Ref: https://github.com/solidusio/circleci-orbs-extensions#test-results-rspec
           if ENV['TEST_RESULTS_PATH']
@@ -82,7 +82,7 @@ module SolidusDevSupport
 
         config.user = repo.owner
         config.project = repo.name
-        config.future_release = "v#{ENV['UNRELEASED_VERSION'] || gemspec.version}"
+        config.future_release = "v#{ENV.fetch('UNRELEASED_VERSION') { gemspec.version }}"
 
       rescue Octokit::InvalidRepository
         warn <<~WARN

data/lib/solidus_dev_support/rspec/capybara.rb

@@ -3,18 +3,28 @@
 require 'webdrivers/chromedriver'
 
 # Allow to override the initial windows size
-CAPYBARA_WINDOW_SIZE = (ENV['CAPYBARA_WINDOW_SIZE'] || '1920x1080').split('x', 2).map(&:to_i)
+CAPYBARA_WINDOW_SIZE = ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080').split('x', 2).map(&:to_i)
+CAPYBARA_WINDOW_WIDTH = CAPYBARA_WINDOW_SIZE[0]
+CAPYBARA_WINDOW_HEIGHT = CAPYBARA_WINDOW_SIZE[1]
 
-Capybara.javascript_driver = (ENV['CAPYBARA_JAVASCRIPT_DRIVER'] || "solidus_chrome_headless").to_sym
+Capybara.javascript_driver = ENV.fetch('CAPYBARA_JAVASCRIPT_DRIVER', "solidus_chrome_headless").to_sym
 Capybara.default_max_wait_time = 10
 Capybara.server = :puma, { Silent: true } # A fix for rspec/rspec-rails#1897
 
 Capybara.drivers[:selenium_chrome_headless].tap do |original_driver|
   Capybara.register_driver :solidus_chrome_headless do |app|
     original_driver.call(app).tap do |driver|
-      driver.options[:options].args << "--window-size=#{CAPYBARA_WINDOW_SIZE.join(',')}"
+      driver.resize_window_to(
+        driver.current_window_handle, CAPYBARA_WINDOW_WIDTH, CAPYBARA_WINDOW_HEIGHT
+      )
     end
   end
 end
 
+require 'capybara-screenshot/rspec'
+
+Capybara::Screenshot.register_driver(:solidus_chrome_headless) do |driver, path|
+  driver.browser.save_screenshot(path)
+end
+
 require 'spree/testing_support/capybara_ext'

data/lib/solidus_dev_support/rspec/feature_helper.rb

@@ -8,11 +8,9 @@
 #
 
 require 'solidus_dev_support/rspec/rails_helper'
-
-require 'capybara-screenshot/rspec'
 require 'solidus_dev_support/rspec/capybara'
 
-def dev_support_assets_preload
+dev_support_assets_preload = ->(*) {
   if Rails.application.respond_to?(:precompiled_assets)
     Rails.application.precompiled_assets
   else
@@ -21,18 +19,14 @@ def dev_support_assets_preload
       Rails.application.assets.find_asset(asset)
     end
   end
-end
+}
 
 RSpec.configure do |config|
   config.when_first_matching_example_defined(type: :feature) do
-    config.before :suite do
-      dev_support_assets_preload
-    end
+    config.before :suite, &dev_support_assets_preload
   end
 
   config.when_first_matching_example_defined(type: :system) do
-    config.before :suite do
-      dev_support_assets_preload
-    end
+    config.before :suite, &dev_support_assets_preload
   end
 end

data/lib/solidus_dev_support/rspec/spec_helper.rb

@@ -14,7 +14,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.color = true
 
-  config.fail_fast = ENV['FAIL_FAST'] || false
+  config.fail_fast = ENV.fetch('FAIL_FAST', false)
   config.order = 'random'
 
   config.raise_errors_for_deprecations!

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

@@ -1,6 +1,9 @@
 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
@@ -11,14 +14,17 @@ jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   lint-code:
     executor: solidusio_extensions/sqlite-memory
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/lint-code
 
 workflows:

data/lib/solidus_dev_support/templates/extension/Gemfile

@@ -6,6 +6,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 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
+
 # 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
@@ -14,7 +18,7 @@ gem 'rails', '>0.a'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 
-case ENV['DB']
+case ENV.fetch('DB', nil)
 when 'mysql'
   gem 'mysql2'
 when 'postgresql'
@@ -23,6 +27,11 @@ else
   gem 'sqlite3'
 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

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

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
+if [ ! -z $DEBUG ]
+then
+  set -x
+fi
 
 case "$DB" in
 postgres|postgresql)
@@ -9,21 +13,36 @@ postgres|postgresql)
 mysql)
   RAILSDB="mysql"
   ;;
-sqlite|'')
+sqlite3|sqlite)
+  RAILSDB="sqlite3"
+  ;;
+'')
+  echo "~~> Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
   RAILSDB="sqlite3"
   ;;
 *)
-  echo "Invalid DB specified: $DB"
+  echo "Invalid value specified for the Solidus sandbox: DB=\"$DB\"."
+  echo "Please use 'postgres', 'mysql', or 'sqlite' instead."
   exit 1
   ;;
 esac
+echo "~~> Using $RAILSDB as the database engine"
 
-if [ ! -z $SOLIDUS_BRANCH ]
+if [ -n $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
+  echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
   BRANCH="master"
 fi
+echo "~~> Using branch $BRANCH of solidus"
+
+if [ -z $SOLIDUS_FRONTEND ]
+then
+  echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend"
+  SOLIDUS_FRONTEND="solidus_frontend"
+fi
+echo "~~> Using branch $SOLIDUS_FRONTEND as the solidus frontend"
 
 extension_name="<%= file_name %>"
 
@@ -50,7 +69,6 @@ fi
 cd ./sandbox
 cat <<RUBY >> Gemfile
 gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
-gem 'solidus_auth_devise', '>= 2.1.0'
 gem 'rails-i18n'
 gem 'solidus_i18n'
 
@@ -71,16 +89,14 @@ unbundled bundle exec rails generate solidus:install \
   --auto-accept \
   --user_class=Spree::User \
   --enforce_available_locales=true \
-  --with-authentication=false \
+  --with-authentication=<%= file_name != 'solidus_auth_devise' %> \
   --payment-method=none \
+  --frontend=${SOLIDUS_FRONTEND} \
   $@
 
-unbundled bundle exec rails generate solidus:auth:install
-unbundled bundle exec rails generate ${extension_name}:install
+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."

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

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = '<%= gemspec.metadata["source_code_uri"] %>'
   spec.metadata['changelog_uri'] = '<%= gemspec.metadata["changelog_uri"] %>'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
 
   # 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.

data/lib/solidus_dev_support/version.rb

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

data/solidus_dev_support.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara-screenshot', '~> 1.0'
   spec.add_dependency 'codecov', '~> 0.2'
   spec.add_dependency 'database_cleaner', '~> 1.7'
-  spec.add_dependency 'factory_bot', '~> 4.8'
+  spec.add_dependency 'factory_bot', '>= 4.8'
   spec.add_dependency 'factory_bot_rails'
   spec.add_dependency 'ffaker', '~> 2.13'
   spec.add_dependency 'gem-release', '~> 2.1'

data/spec/features/create_extension_spec.rb

@@ -155,18 +155,22 @@ RSpec.describe 'Create extension' do
 
   def sh(*args)
     command = args.size == 1 ? args.first : args.shelljoin
-    output, status = with_unbundled_env { Open3.capture2e(command) }
+    output, status = with_unbundled_env do
+      Open3.capture2e({ 'CI' => nil }, command)
+    end
 
-    if status.success?
-      output.to_s
-    else
-      if $DEBUG
-        warn '~' * 80
-        warn "$ #{command}"
-        warn output.to_s
-      end
+    if $DEBUG || ENV['DEBUG']
+      warn '~' * 80
+      warn "$ #{command}"
+      warn output.to_s
+      warn "$ #{command} ~~~~> EXIT STATUS: #{status.exitstatus}"
+    end
+
+    unless status.success?
       raise(command_failed_error, "command failed: #{command}\n#{output}")
     end
+
+    output.to_s
   end
 
   def with_unbundled_env(&block)
@@ -182,11 +186,12 @@ RSpec.describe 'Create extension' do
     # variables doesn't help because commands are run with a clean env.
     bundle_path = "#{gem_root}/vendor/bundle"
 
-    command = 'bundle install'
-    command += " --path=#{bundle_path.shellescape}" if File.exist?(bundle_path)
+    if File.exist?(bundle_path)
+      sh "bundle config set --local path #{bundle_path.shellescape}"
+    end
 
     output = nil
-    cd(install_path) { output = sh command }
+    cd(install_path) { output = sh 'bundle install' }
     output
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.5
 platform: ruby
 authors:
 - Alessandro Desantis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -70,14 +70,14 @@ dependencies:
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
@@ -308,7 +308,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - alessandrodesantis@nebulab.it
 executables:
@@ -397,7 +397,7 @@ metadata:
   source_code_uri: https://github.com/solidusio/solidus_dev_support
   changelog_uri: https://github.com/solidusio/solidus_dev_support/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -412,8 +412,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.21
+signing_key:
 specification_version: 4
 summary: Development tools for Solidus extensions.
 test_files: