solidus_core 4.6.2 → 4.7.0

data/lib/spree/testing_support/factories/taxon_factory.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :taxon, class: 'Spree::Taxon' do
-    name { 'Ruby on Rails' }
+  factory :taxon, class: "Spree::Taxon" do
+    name { "Ruby on Rails" }
     taxonomy_id { (parent&.taxonomy || create(:taxonomy)).id }
     parent_id { parent&.id || taxonomy.root.id }
 
     trait :with_icon do
       after(:create) do |taxon|
-        taxon.update(icon: Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open)
+        taxon.update(icon: Spree::Core::Engine.root.join("lib", "spree", "testing_support", "fixtures", "blank.jpg").open)
       end
     end
   end

data/lib/spree/testing_support/factories/taxonomy_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :taxonomy, class: 'Spree::Taxonomy' do
+  factory :taxonomy, class: "Spree::Taxonomy" do
     sequence :name do |seq|
       "Brand #{seq}"
     end

data/lib/spree/testing_support/factories/user_factory.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :user, class: Spree::UserClassHandle.new do
     email { generate(:email) }
-    password { 'secret' }
+    password { "secret" }
     password_confirmation { password }
 
     trait :with_api_key do
@@ -20,7 +20,7 @@ FactoryBot.define do
 
     factory :admin_user do
       after(:create) do |user, _|
-        admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+        admin_role = Spree::Role.find_by(name: "admin") || create(:role, name: "admin")
         user.spree_roles << admin_role
       end
     end

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
 
-  factory :base_variant, class: 'Spree::Variant' do
+  factory :base_variant, class: "Spree::Variant" do
     price { 19.99 }
     cost_price { 17.00 }
     sku { generate(:sku) }
@@ -23,7 +23,7 @@ FactoryBot.define do
 
     factory :master_variant do
       is_master { 1 }
-      before(:create){ |variant| variant.product.master = variant }
+      before(:create) { |variant| variant.product.master = variant }
       product { build(:base_product) }
     end
 

data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :variant_property_rule_condition, class: 'Spree::VariantPropertyRuleCondition' do
+  factory :variant_property_rule_condition, class: "Spree::VariantPropertyRuleCondition" do
     variant_property_rule
     option_value
   end

data/lib/spree/testing_support/factories/variant_property_rule_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :variant_property_rule, class: 'Spree::VariantPropertyRule' do
+  factory :variant_property_rule, class: "Spree::VariantPropertyRule" do
     product
 
     transient do

data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :variant_property_rule_value, class: 'Spree::VariantPropertyRuleValue' do
+  factory :variant_property_rule_value, class: "Spree::VariantPropertyRuleValue" do
     variant_property_rule
     property
   end

data/lib/spree/testing_support/factories/zone_factory.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :global_zone, class: 'Spree::Zone' do
-    initialize_with { Spree::Zone.find_or_initialize_by(name: 'GlobalZone') }
+  factory :global_zone, class: "Spree::Zone" do
+    initialize_with { Spree::Zone.find_or_initialize_by(name: "GlobalZone") }
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }
       Spree::Country.all.map do |c|
@@ -11,7 +11,7 @@ FactoryBot.define do
     end
   end
 
-  factory :zone, class: 'Spree::Zone' do
+  factory :zone, class: "Spree::Zone" do
     sequence(:name) { |i| "Zone #{i}" }
 
     trait :with_country do

data/lib/spree/testing_support/factory_bot.rb

@@ -14,7 +14,7 @@ module Spree
       PATHS = SEQUENCES + FACTORIES
 
       def self.definition_file_paths
-        @paths ||= PATHS.map { |path| path.sub(/.rb\z/, '') }
+        @paths ||= PATHS.map { |path| path.sub(/.rb\z/, "") }
       end
 
       def self.check_version

data/lib/spree/testing_support/flaky.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rspec/retry'
+
+require "rspec/retry"
 
 # Usage:
 #
@@ -13,7 +14,7 @@ RSpec.configure do |config|
   config.display_try_failure_messages = true
 
   config.around(:each, :flaky) do |example|
-    if ENV['CI']
+    if ENV["CI"]
       example.run_with_retry retry: 2
     else
       example.run

data/lib/spree/testing_support/flash.rb

@@ -12,7 +12,7 @@ module Spree
       end
 
       def assert_successful_update_message(resource)
-        flash = I18n.t('spree.successfully_updated', resource: I18n.t(resource, scope: 'spree'))
+        flash = I18n.t("spree.successfully_updated", resource: I18n.t(resource, scope: "spree"))
         assert_flash_success(flash)
       end
 
@@ -20,7 +20,7 @@ module Spree
 
       def convert_flash(flash)
         if flash.is_a?(Symbol)
-          flash = I18n.t(flash, scope: 'spree')
+          flash = I18n.t(flash, scope: "spree")
         end
         flash
       end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -10,7 +10,7 @@ module Spree
       def up_to(state, user: nil)
         # Need to create a valid zone too...
         @zone = ::FactoryBot.create(:zone)
-        @country = ::FactoryBot.create(:country)
+        @country = Spree::Country.find_by(iso: "US") || ::FactoryBot.create(:country)
         @state = ::FactoryBot.create(:state, country: @country)
 
         @zone.members << Spree::ZoneMember.create(zoneable: @country)
@@ -31,11 +31,11 @@ module Spree
         order.next!
 
         states_to_process = if state == :complete
-                              states
-                            else
-                              end_state_position = states.index(state.to_sym)
-                              states[..end_state_position]
-                            end
+          states
+        else
+          end_state_position = states.index(state.to_sym)
+          states[..end_state_position]
+        end
 
         states_to_process.each do |state_to_process|
           send(state_to_process, order)
@@ -65,7 +65,7 @@ module Spree
         credit_card = ::FactoryBot.create(:credit_card, user: order.user)
         order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
         # TODO: maybe look at some way of making this payment_state change automatic
-        order.payment_state = 'paid'
+        order.payment_state = "paid"
         order.next!
       end
 

data/lib/spree/testing_support/preferences.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def assert_preference_unset(preference)
-        find("#preferences_#{preference}")['checked'].should be false
+        find("#preferences_#{preference}")["checked"].should be false
         Spree::Config[preference].should be false
       end
 

data/lib/spree/testing_support/rake.rb

@@ -4,7 +4,7 @@
 # Rake task spec setup.
 #
 RSpec.shared_context "rake" do |task_path:, task_name:|
-  require 'rake'
+  require "rake"
 
   let(:task) do
     Rake::Task[task_name]

data/lib/spree/testing_support/shared_examples/calculator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples_for 'a calculator with a description' do
+RSpec.shared_examples_for "a calculator with a description" do
   describe ".description" do
     subject { described_class.description }
     it "has a description" do

data/lib/spree/testing_support/shared_examples/gallery.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples 'a gallery' do
-  describe '#images' do
+RSpec.shared_examples "a gallery" do
+  describe "#images" do
     subject { gallery.images }
 
     it { is_expected.to be_empty }
 
-    context 'there are images' do
-      include_context 'has multiple images'
+    context "there are images" do
+      include_context "has multiple images"
 
-      it 'has the associated images' do
-        expect(subject.map(&:id)).
-          to match_array([first_image.id, second_image.id])
+      it "has the associated images" do
+        expect(subject.map(&:id))
+          .to match_array([first_image.id, second_image.id])
       end
     end
   end

data/lib/spree/testing_support/shared_examples/order_factory.rb

@@ -37,8 +37,8 @@ RSpec.shared_examples "an order with line items factory" do |expected_order_stat
         factory,
         stock_location:,
         line_items_attributes: [
-          { variant: first_variant, quantity: 1, price: 1 },
-          { variant: second_variant, quantity: 2, price: 2 }
+          {variant: first_variant, quantity: 1, price: 1},
+          {variant: second_variant, quantity: 2, price: 2}
         ],
         shipment_cost: 3,
         shipping_method:
@@ -104,7 +104,7 @@ RSpec.shared_examples "an order with line items factory" do |expected_order_stat
     end
   end
 
-  context 'when shipments should be taxed' do
+  context "when shipments should be taxed" do
     let!(:ship_address) { create(:address) }
     let!(:tax_zone) { create(:global_zone) } # will include the above address
     let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_categories: [tax_category]) }
@@ -112,7 +112,7 @@ RSpec.shared_examples "an order with line items factory" do |expected_order_stat
     let(:tax_category) { create(:tax_category) }
     let(:shipping_method) { create(:shipping_method, tax_category:, zones: [tax_zone]) }
 
-    it 'shipments get a tax adjustment' do
+    it "shipments get a tax adjustment" do
       order = create(factory, ship_address:, shipping_method:)
       shipment = order.shipments[0]
 
@@ -121,20 +121,20 @@ RSpec.shared_examples "an order with line items factory" do |expected_order_stat
   end
 end
 
-RSpec.shared_examples 'supplied completed_at is respected' do
-  context 'when passed a completed_at timestamp' do
+RSpec.shared_examples "supplied completed_at is respected" do
+  context "when passed a completed_at timestamp" do
     let(:completed_at) { 2.days.ago }
     let(:order) { create(factory, completed_at:) }
 
-    it 'respects the timestamp' do
+    it "respects the timestamp" do
       expect(order.completed_at).to be_within(5.seconds).of(completed_at)
     end
   end
 
-  context 'when no completed_at timestamp is passed' do
+  context "when no completed_at timestamp is passed" do
     let(:order) { create(factory) }
 
-    it 'defaults to the current time' do
+    it "defaults to the current time" do
       expect(order.completed_at).to be_within(2.seconds).of(Time.current)
     end
   end

data/lib/spree/testing_support/shared_examples/working_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples_for 'a working factory' do
+RSpec.shared_examples_for "a working factory" do
   it "builds successfully" do
     expect(build(factory)).to be_a(factory_class)
   end

data/lib/spree/testing_support/translations.rb

@@ -4,7 +4,7 @@ module Spree
   module TestingSupport
     module Translations
       def check_missing_translations(page, example)
-        missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)
+        missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<"&]/)
         if missing_translations.any?
           Rails.logger.info "Found missing translations: #{missing_translations.inspect}"
           Rails.logger.info "In spec: #{example.location}"

data/lib/spree_core.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'spree/core'
+require "spree/core"

data/lib/tasks/payment_method.rake

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 namespace :payment_method do
-  desc "Deactivates old payment methods and fixes ActiveRecord::SubclassNotFound error, "\
+  desc "Deactivates old payment methods and fixes ActiveRecord::SubclassNotFound error, " \
   "which happens after switching Payment Service Provider."
   task deactivate_unsupported_payment_methods: :environment do
     Spree::PaymentMethod.pluck(:id, :type).select do |id, type|
@@ -24,6 +24,6 @@ namespace :payment_method do
         available_to_admin=#{false_value}
       WHERE id=#{id};
     SQL
-    )
+                          )
   end
 end

data/solidus_core.gemspec

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require_relative '../core/lib/spree/core/version.rb'
+require_relative "../core/lib/spree/core/version"
 
 Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_core'
-  s.version     = Spree.solidus_version
-  s.summary     = 'Essential models, mailers, and classes for the Solidus e-commerce project.'
+  s.platform = Gem::Platform::RUBY
+  s.name = "solidus_core"
+  s.version = Spree.solidus_version
+  s.summary = "Essential models, mailers, and classes for the Solidus e-commerce project."
   s.description = s.summary
 
-  s.author      = 'Solidus Team'
-  s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io'
-  s.license     = 'BSD-3-Clause'
+  s.author = "Solidus Team"
+  s.email = "contact@solidus.io"
+  s.homepage = "http://solidus.io"
+  s.license = "BSD-3-Clause"
 
-  s.metadata['rubygems_mfa_required'] = 'true'
+  s.metadata["rubygems_mfa_required"] = "true"
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|bin)/})
   end
 
-  s.required_ruby_version = '>= 3.1.0'
-  s.required_rubygems_version = '>= 1.8.23'
+  s.required_ruby_version = ">= 3.2.0"
+  s.required_rubygems_version = ">= 1.8.23"
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
@@ -29,51 +29,51 @@ Gem::Specification.new do |s|
   ].each do |rails_dep|
     s.add_dependency rails_dep, [
       ">= #{Spree.minimum_required_rails_version}",
-      "< 8.1.0.beta1"
+      "< 8.2"
     ]
   end
 
-  s.add_dependency 'activemerchant', '~> 1.66'
-  s.add_dependency 'acts_as_list', '< 2.0'
-  s.add_dependency 'awesome_nested_set', ['~> 3.3', '>= 3.7.0']
-  s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
-  s.add_dependency 'carmen', '~> 1.1.0'
-  s.add_dependency 'discard', '~> 1.0'
-  s.add_dependency 'friendly_id', '~> 5.0'
-  s.add_dependency 'image_processing', '~> 1.10'
-  s.add_dependency 'kaminari-activerecord', '~> 1.1'
-  s.add_dependency 'mini_magick', '~> 4.10'
-  s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
-  s.add_dependency 'psych', ['>= 4.0.1', '< 6.0']
-  s.add_dependency 'ransack', ['~> 4.0', '< 5']
-  s.add_dependency 'sprockets-rails', '!= 3.5.0'
-  s.add_dependency 'state_machines', ['~> 0.6', '< 0.10.0']
-  s.add_dependency 'state_machines-activerecord', ['~> 0.6', '< 0.10.0']
-  s.add_dependency 'omnes', '~> 0.2.2'
+  s.add_dependency "activemerchant", "~> 1.66"
+  s.add_dependency "acts_as_list", "< 2.0"
+  s.add_dependency "awesome_nested_set", ["~> 3.3", ">= 3.7.0"]
+  s.add_dependency "cancancan", [">= 2.2", "< 4.0"]
+  s.add_dependency "carmen", "~> 1.1.0"
+  s.add_dependency "db-query-matchers", "~> 0.14"
+  s.add_dependency "discard", "~> 1.0"
+  s.add_dependency "friendly_id", "~> 5.0"
+  s.add_dependency "image_processing", "~> 1.10"
+  s.add_dependency "kaminari-activerecord", "~> 1.1"
+  s.add_dependency "mini_magick", "~> 4.10"
+  s.add_dependency "monetize", "~> 1.8"
+  s.add_dependency "kt-paperclip", [">= 6.3", "< 8"]
+  s.add_dependency "psych", [">= 4.0.1", "< 6.0"]
+  s.add_dependency "ransack", ["~> 4.0", "< 5"]
+  s.add_dependency "state_machines", ["~> 0.6", "< 0.10.0"]
+  s.add_dependency "state_machines-activerecord", ["~> 0.6", "< 0.10.0"]
+  s.add_dependency "omnes", "~> 0.2.2"
 
-  s.post_install_message = <<-MSG
--------------------------------------------------------------
-                Thank you for using Solidus
--------------------------------------------------------------
-If this is a fresh install, don't forget to run the Solidus
-installer with the following command:
+  s.post_install_message = <<~MSG
+    -------------------------------------------------------------
+                    Thank you for using Solidus
+    -------------------------------------------------------------
+    If this is a fresh install, don't forget to run the Solidus
+    installer with the following command:
 
-$ bin/rails g solidus:install
+    $ bin/rails g solidus:install
 
-If you are updating Solidus from an older version, please run
-the following commands to complete the update:
+    If you are updating Solidus from an older version, please run
+    the following commands to complete the update:
 
-$ bin/rails g solidus:update
+    $ bin/rails g solidus:update
 
-Please, don't forget to look at the CHANGELOG to see what has changed and
-whether you need to perform other tasks.
+    Please, don't forget to look at the CHANGELOG to see what has changed and
+    whether you need to perform other tasks.
 
-https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
+    https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
 
-Please report any issues at:
-- https://github.com/solidusio/solidus/issues
-- http://slack.solidus.io/
--------------------------------------------------------------
-MSG
+    Please report any issues at:
+    - https://github.com/solidusio/solidus/issues
+    - http://slack.solidus.io/
+    -------------------------------------------------------------
+  MSG
 end