Fix the CI after the Solidus v3.2 release

.circleci/config.yml

@@ -1,24 +1,39 @@
 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
 
-  browser-tools: circleci/browser-tools@1.1
+executors:
+  sqlite:
+    description: Run specs with an in-memory SQLite
+    docker:
+      - image: cimg/ruby:2.7-browsers
+        environment:
+          RAILS_ENV: test
+          DB: sqlite
 
 jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
-      - browser-tools/install-browser-tools
+      - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
-      - browser-tools/install-browser-tools
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests
+  run-specs-with-sqlite:
+    executor: sqlite
+    steps:
+      - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   lint-code:
     executor: solidusio_extensions/sqlite-memory
@@ -30,6 +45,8 @@ workflows:
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql
+      - run-specs-with-sqlite
+      - lint-code
 
   "Weekly run specs against master":
     triggers:

.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 require:
   - solidus_dev_support/rubocop
 

.rubocop_todo.yml

@@ -0,0 +1,298 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-08-30 14:09:43 UTC using RuboCop version 1.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'solidus_stripe.gemspec'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ClosingParenthesisIndentation:
+  Exclude:
+    - 'spec/requests/payment_requests_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ElseAlignment:
+  Exclude:
+    - 'app/models/solidus_stripe/address_from_params_service.rb'
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'app/models/solidus_stripe/address_from_params_service.rb'
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'app/models/solidus_stripe/address_from_params_service.rb'
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBrackets: space, no_space
+Layout/SpaceInsideArrayLiteralBrackets:
+  Exclude:
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+    - 'spec/requests/payment_requests_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'bin/sandbox_rails'
+    - 'lib/generators/solidus_stripe/install/install_generator.rb'
+
+# Offense count: 10
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/requests/payment_requests_spec.rb'
+
+# Offense count: 6
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 8
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: method_call, block
+RSpec/ExpectChange:
+  Exclude:
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 6
+RSpec/ExpectInHook:
+  Exclude:
+    - 'spec/features/stripe_checkout_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/LeadingSubject:
+  Exclude:
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+
+# Offense count: 2
+RSpec/LetSetup:
+  Exclude:
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 9
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 13
+RSpec/MultipleExpectations:
+  Max: 15
+
+# Offense count: 40
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 11
+
+# Offense count: 47
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/models/solidus_stripe/address_from_params_service_spec.rb'
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+    - 'spec/models/solidus_stripe/shipping_rates_service_spec.rb'
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 13
+RSpec/NestedGroups:
+  Max: 5
+
+# Offense count: 2
+RSpec/RepeatedExampleGroupBody:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: and_return, block
+RSpec/ReturnFromStub:
+  Exclude:
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 4
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 3
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 12
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/models/solidus_stripe/create_intents_payment_service_spec.rb'
+    - 'spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb'
+    - 'spec/models/spree/payment_method/stripe_credit_card_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforceForPrefixed.
+Rails/Delegate:
+  Exclude:
+    - 'app/models/spree/payment_method/stripe_credit_card.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Whitelist, AllowedMethods, AllowedReceivers.
+# Whitelist: find_by_sql
+# AllowedMethods: find_by_sql
+# AllowedReceivers: Gem::Specification
+Rails/DynamicFindBy:
+  Exclude:
+    - 'app/models/solidus_stripe/address_from_params_service.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Include, IgnoredMethods.
+# Include: app/models/**/*.rb
+# IgnoredMethods: order, limit, select, lock
+Rails/FindEach:
+  Exclude:
+    - 'app/models/solidus_stripe/create_intents_payment_service.rb'
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
+Rails/Output:
+  Exclude:
+    - 'db/seeds.rb'
+
+# Offense count: 3
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/20181010123508_update_stripe_payment_method_type_to_credit_card.rb'
+    - 'spec/models/solidus_stripe/shipping_rates_service_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'app/models/spree/payment_method/stripe_credit_card.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/ExplicitBlockArgument:
+  Exclude:
+    - 'spec/features/stripe_checkout_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
+Style/GuardClause:
+  Exclude:
+    - 'app/decorators/models/spree/order_update_attributes_decorator.rb'
+    - 'app/models/solidus_stripe/create_intents_payment_service.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'app/models/spree/payment_method/stripe_credit_card.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'app/models/spree/payment_method/stripe_credit_card.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
+Style/NestedParenthesizedCalls:
+  Exclude:
+    - 'lib/solidus_stripe/testing_support/card_input_helper.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantBegin:
+  Exclude:
+    - 'app/models/solidus_stripe/address_from_params_service.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RedundantInterpolation:
+  Exclude:
+    - 'lib/solidus_stripe/testing_support/card_input_helper.rb'
+
+# Offense count: 19
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 163

Gemfile

@@ -4,13 +4,12 @@ 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
+gem 'solidus', github: 'solidusio/solidus', branch: branch
+
+# The solidus_frontend gem has been pulled out since v3.2
+if (branch == 'master') || (branch >= 'v3.2')
+  gem 'solidus_frontend', github: 'solidusio/solidus_frontend', branch: branch
+end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
@@ -20,7 +19,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'