Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove outdated Rails version checks
Rafal Cymerys66e053db9047
diff --git a/api/lib/spree/api/testing_support/serializers.rb b/api/lib/spree/api/testing_support/serializers.rbindex 207654bc29..75b7d7b346 100644--- a/api/lib/spree/api/testing_support/serializers.rb+++ b/api/lib/spree/api/testing_support/serializers.rb@@ -5,21 +5,11 @@ module Spreeendshared_examples 'an ActiveJob serializable hash' do- context 'Rails < 6', if: Rails::VERSION::MAJOR < 6 do- it 'can not be serialized by ActiveJob' do- expect { Spree::TestArgumentsJob.perform_later(subject) }.to(- raise_error(ActiveJob::SerializationError, 'Unsupported argument type: Symbol')- )- end- end-- context 'Rails >= 6', if: Rails::VERSION::MAJOR >= 6 do- it 'can be serialized by ActiveJob' do- # It should fail if subject contains any custom instance (e.g Spree::Money)- expect { Spree::TestArgumentsJob.perform_later(subject) }.not_to raise_error- expect { Spree::TestArgumentsJob.perform_later(subject.merge(price: Spree::Money.new(0))) }.to(- raise_error(ActiveJob::SerializationError)- )- end+ it 'can be serialized by ActiveJob' do+ # It should fail if subject contains any custom instance (e.g Spree::Money)+ expect { Spree::TestArgumentsJob.perform_later(subject) }.not_to raise_error+ expect { Spree::TestArgumentsJob.perform_later(subject.merge(price: Spree::Money.new(0))) }.to(+ raise_error(ActiveJob::SerializationError)+ )endenddiff --git a/core/app/finders/spree/taxons/find.rb b/core/app/finders/spree/taxons/find.rbindex 5b46b19a7e..b13da11820 100644--- a/core/app/finders/spree/taxons/find.rb+++ b/core/app/finders/spree/taxons/find.rb@@ -65,15 +65,9 @@ module Spreedef by_parent_permalink(taxons)return taxons unless parent_permalink?- if Rails::VERSION::STRING >= '6.1'- taxons.joins(:parent).- join_translation_table(Taxon, 'parents_spree_taxons').- where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])- else- taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").- join_translation_table(Taxon, 'parent_taxon').- where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])- end+ taxons.joins(:parent).+ join_translation_table(Taxon, 'parents_spree_taxons').+ where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])enddef by_taxonomy(taxons)diff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rbindex 1d2623c4ea..8f21b3f952 100644--- a/core/app/helpers/spree/base_helper.rb+++ b/core/app/helpers/spree/base_helper.rb@@ -174,10 +174,6 @@ module SpreeSpree::Core::Engine.frontend_available?end- def rails_5?- Rails::VERSION::STRING < '6.0'- end-def spree_storefront_resource_url(resource, options = {})if defined?(locale_param) && locale_param.present?options.merge!(locale: locale_param)diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex a7fc69807c..6279712cca 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -10,9 +10,7 @@ module Spreeinclude Spree::Security::Addressesend- if Rails::VERSION::STRING >= '6.1'- serialize :preferences, Hash, default: {}- end+ serialize :preferences, Hash, default: {}NO_ZIPCODE_ISO_CODES ||= ['AO', 'AG', 'AW', 'BS', 'BZ', 'BJ', 'BM', 'BO', 'BW', 'BF', 'BI', 'CM', 'CF', 'KM', 'CG',diff --git a/core/app/models/spree/cms/sections/image_gallery.rb b/core/app/models/spree/cms/sections/image_gallery.rbindex ebb0931ad5..6d5fc978c6 100644--- a/core/app/models/spree/cms/sections/image_gallery.rb+++ b/core/app/models/spree/cms/sections/image_gallery.rb@@ -3,11 +3,7 @@ module Spree::Cms::Sectionsafter_initialize :default_valuesvalidate :reset_multiple_link_attributes- LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'- ['Spree::Taxon'].freeze- else- ['Spree::Taxon', 'Spree::Product'].freeze- end+ LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freezeLAYOUT_OPTIONS = ['Default', 'Reversed'].freezeLABEL_OPTIONS = ['Show', 'Hide'].freeze@@ -71,8 +67,6 @@ module Spree::Cms::Sectionsprivatedef reset_multiple_link_attributes- return if Rails::VERSION::STRING < '6.0'-if link_type_one_changed?return if link_type_one_was.nil?diff --git a/core/app/models/spree/cms/sections/side_by_side_images.rb b/core/app/models/spree/cms/sections/side_by_side_images.rbindex 408c2d7487..24119e3a68 100644--- a/core/app/models/spree/cms/sections/side_by_side_images.rb+++ b/core/app/models/spree/cms/sections/side_by_side_images.rb@@ -3,11 +3,7 @@ module Spree::Cms::Sectionsafter_initialize :default_valuesvalidate :reset_multiple_link_attributes- LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'- ['Spree::Taxon'].freeze- else- ['Spree::Taxon', 'Spree::Product'].freeze- end+ LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freezestore :content, accessors: [:link_type_one, :link_one, :title_one, :subtitle_one,:link_type_two, :link_two, :title_two, :subtitle_two], coder: JSON@@ -49,8 +45,6 @@ module Spree::Cms::Sectionsprivatedef reset_multiple_link_attributes- return if Rails::VERSION::STRING < '6.0'-if link_type_one_changed?return if link_type_one_was.nil?diff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rbindex 99b9496062..21c183600a 100644--- a/core/app/models/spree/payment.rb+++ b/core/app/models/spree/payment.rb@@ -222,18 +222,10 @@ module Spreedef validate_sourceif source && !source.valid?- if Rails::VERSION::STRING >= '6.1'- source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|- next if err[:field].blank? || err[:message].blank?-- add_source_error(err[:field], err[:message])- end- else- source.errors.messages.each do |field, error|- next if field.blank? || error.empty?-- add_source_error(field, error.first)- end+ source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|+ next if err[:field].blank? || err[:message].blank?++ add_source_error(err[:field], err[:message])endend!errors.present?diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex 2042c0b612..a0e27908e0 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -507,18 +507,10 @@ module Spree# We call master.default_price here to ensure price is initialized.# Required to avoid Variant#check_price validation failing on create.unless master.default_price && master.valid?- if Rails::VERSION::STRING >= '6.1'- master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|- next if err[:field].blank? || err[:message].blank?+ master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|+ next if err[:field].blank? || err[:message].blank?- errors.add(err[:field], err[:message])- end- else- master.errors.messages.each do |field, error|- next if field.blank? || error.empty?-- errors.add(field, error.first)- end+ errors.add(err[:field], err[:message])endendenddiff --git a/core/app/services/spree/seeds/countries.rb b/core/app/services/spree/seeds/countries.rbindex 1a23f94347..c326cb16c1 100644--- a/core/app/services/spree/seeds/countries.rb+++ b/core/app/services/spree/seeds/countries.rb@@ -9,34 +9,19 @@ module Spreedef callApplicationRecord.transaction do- if Rails::VERSION::MAJOR >= 6- new_countries = Carmen::Country.all.map do |country|- # Skip the creation of some territories, uninhabited islands and the Antarctic.- next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)+ new_countries = Carmen::Country.all.map do |country|+ # Skip the creation of some territories, uninhabited islands and the Antarctic.+ next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)- Hash[- 'name': country.name,- 'iso3': country.alpha_3_code,- 'iso': country.alpha_2_code,- 'iso_name': country.name.upcase,- 'numcode': country.numeric_code,- ]- end.compact.uniq- Spree::Country.insert_all(new_countries)- else- Carmen::Country.all.each do |country|- # Skip the creation of some territories, uninhabited islands and the Antarctic.- next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)-- Spree::Country.where(- name: country.name,- iso3: country.alpha_3_code,- iso: country.alpha_2_code,- iso_name: country.name.upcase,- numcode: country.numeric_code- ).first_or_create!- end- end+ Hash[+ 'name': country.name,+ 'iso3': country.alpha_3_code,+ 'iso': country.alpha_2_code,+ 'iso_name': country.name.upcase,+ 'numcode': country.numeric_code,+ ]+ end.compact.uniq+ Spree::Country.insert_all(new_countries)# Find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)diff --git a/core/app/services/spree/seeds/states.rb b/core/app/services/spree/seeds/states.rbindex 665f95beab..4ebc00d473 100644--- a/core/app/services/spree/seeds/states.rb+++ b/core/app/services/spree/seeds/states.rb@@ -49,23 +49,14 @@ module Spreeenddef province_level(country, subregion)- if Rails::VERSION::MAJOR >= 6- new_states = subregion.subregions.map do |province|- Hash[- name: province.name,- abbr: province.code,- country_id: country.id- ]- end.compact.uniq- Spree::State.insert_all(new_states)- else- subregion.subregions.each do |province|- country.states.where(- name: province.name,- abbr: province.code- ).first_or_create!- end- end+ new_states = subregion.subregions.map do |province|+ Hash[+ name: province.name,+ abbr: province.code,+ country_id: country.id+ ]+ end.compact.uniq+ Spree::State.insert_all(new_states)endendenddiff --git a/core/app/services/spree/stock_locations/stock_items/create.rb b/core/app/services/spree/stock_locations/stock_items/create.rbindex dc2c148271..ab6660c7a1 100644--- a/core/app/services/spree/stock_locations/stock_items/create.rb+++ b/core/app/services/spree/stock_locations/stock_items/create.rb@@ -5,24 +5,18 @@ module Spreeprepend Spree::ServiceModule::Basedef call(stock_location:, variants_scope: Spree::Variant)- if Rails::VERSION::MAJOR >= 6- prepared_stock_items = variants_scope.ids.map do |variant_id|- Hash[- 'stock_location_id', stock_location.id,- 'variant_id', variant_id,- 'backorderable', stock_location.backorderable_default,- 'created_at', Time.current,- 'updated_at', Time.current- ]- end- if prepared_stock_items.any?- stock_location.stock_items.insert_all(prepared_stock_items)- variants_scope.touch_all- end- else- variants_scope.find_each do |variant|- stock_location.propagate_variant(variant)- end+ prepared_stock_items = variants_scope.ids.map do |variant_id|+ Hash[+ 'stock_location_id', stock_location.id,+ 'variant_id', variant_id,+ 'backorderable', stock_location.backorderable_default,+ 'created_at', Time.current,+ 'updated_at', Time.current+ ]+ end+ if prepared_stock_items.any?+ stock_location.stock_items.insert_all(prepared_stock_items)+ variants_scope.touch_allendendenddiff --git a/core/config/initializers/rails61_fixes.rb b/core/config/initializers/rails61_fixes.rbindex ed74fa21ba..2b7c61ea19 100644--- a/core/config/initializers/rails61_fixes.rb+++ b/core/config/initializers/rails61_fixes.rb@@ -1,3 +1 @@-if Rails::VERSION::STRING >= '6.1'- ActiveRecord::Base.has_many_inversing = false-end+ActiveRecord::Base.has_many_inversing = falsediff --git a/core/spec/models/spree/cms/sections/image_gallery_spec.rb b/core/spec/models/spree/cms/sections/image_gallery_spec.rbindex ce0effa24b..8b920fc410 100644--- a/core/spec/models/spree/cms/sections/image_gallery_spec.rb+++ b/core/spec/models/spree/cms/sections/image_gallery_spec.rb@@ -58,46 +58,44 @@ describe Spree::Cms::Sections::ImageGallery, type: :model doendend- if Rails::VERSION::STRING >= '6.0'- context 'when changing the link types for links one two and three' do- let!(:image_gallery_section) { create(:cms_image_gallery_section, cms_page: homepage) }-- before do- section = Spree::CmsSection.find(image_gallery_section.id)-- section.content[:link_type_one] = 'Spree::Product'- section.content[:link_type_two] = 'Spree::Product'- section.content[:link_type_three] = 'Spree::Product'-- section.content[:link_one] = 'Shirt 1'- section.content[:link_two] = 'Shirt 2'- section.content[:link_three] = 'Shirt 3'-- section.save!- section.reload- end-- it 'link_one, link_two and save the initial values' do- section = Spree::CmsSection.find(image_gallery_section.id)-- expect(section.link_one).to eql 'Shirt 1'- expect(section.link_two).to eql 'Shirt 2'- expect(section.link_three).to eql 'Shirt 3'- end-- it 'link_one, link_two and link_three are reset to nil' do- section = Spree::CmsSection.find(image_gallery_section.id)-- section.content[:link_type_one] = 'Spree::Taxon'- section.content[:link_type_two] = 'Spree::Taxon'- section.content[:link_type_three] = 'Spree::Taxon'- section.save!- section.reload-- expect(section.link_one).to be nil- expect(section.link_two).to be nil- expect(section.link_three).to be nil- end+ context 'when changing the link types for links one two and three' do+ let!(:image_gallery_section) { create(:cms_image_gallery_section, cms_page: homepage) }++ before do+ section = Spree::CmsSection.find(image_gallery_section.id)++ section.content[:link_type_one] = 'Spree::Product'+ section.content[:link_type_two] = 'Spree::Product'+ section.content[:link_type_three] = 'Spree::Product'++ section.content[:link_one] = 'Shirt 1'+ section.content[:link_two] = 'Shirt 2'+ section.content[:link_three] = 'Shirt 3'++ section.save!+ section.reload+ end++ it 'link_one, link_two and save the initial values' do+ section = Spree::CmsSection.find(image_gallery_section.id)++ expect(section.link_one).to eql 'Shirt 1'+ expect(section.link_two).to eql 'Shirt 2'+ expect(section.link_three).to eql 'Shirt 3'+ end++ it 'link_one, link_two and link_three are reset to nil' do+ section = Spree::CmsSection.find(image_gallery_section.id)++ section.content[:link_type_one] = 'Spree::Taxon'+ section.content[:link_type_two] = 'Spree::Taxon'+ section.content[:link_type_three] = 'Spree::Taxon'+ section.save!+ section.reload++ expect(section.link_one).to be nil+ expect(section.link_two).to be nil+ expect(section.link_three).to be nilendendenddiff --git a/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb b/core/spec/models/spree/cms/sections/side_by_side_images_spec.rbindex 378da7a0fb..d33115b5e8 100644--- a/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb+++ b/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb@@ -46,41 +46,39 @@ describe Spree::Cms::Sections::SideBySideImages, type: :model doendend- if Rails::VERSION::STRING >= '6.0'- context 'when changing the link types for links one and two' do- let!(:side_by_side_images_section) { create(:cms_side_by_side_images_section, cms_page: homepage) }+ context 'when changing the link types for links one and two' do+ let!(:side_by_side_images_section) { create(:cms_side_by_side_images_section, cms_page: homepage) }- before do- section = Spree::CmsSection.find(side_by_side_images_section.id)+ before do+ section = Spree::CmsSection.find(side_by_side_images_section.id)- section.content[:link_type_one] = 'Spree::Product'- section.content[:link_type_two] = 'Spree::Product'+ section.content[:link_type_one] = 'Spree::Product'+ section.content[:link_type_two] = 'Spree::Product'- section.content[:link_one] = 'Shirt 1'- section.content[:link_two] = 'Shirt 2'+ section.content[:link_one] = 'Shirt 1'+ section.content[:link_two] = 'Shirt 2'- section.save!- section.reload- end+ section.save!+ section.reload+ end- it 'link_one and link_two save the values correctly' do- section = Spree::CmsSection.find(side_by_side_images_section.id)+ it 'link_one and link_two save the values correctly' do+ section = Spree::CmsSection.find(side_by_side_images_section.id)- expect(section.link_one).to eql 'Shirt 1'- expect(section.link_two).to eql 'Shirt 2'- end+ expect(section.link_one).to eql 'Shirt 1'+ expect(section.link_two).to eql 'Shirt 2'+ end- it 'link_one and link_two are reset to nil when type is changed' do- section = Spree::CmsSection.find(side_by_side_images_section.id)+ it 'link_one and link_two are reset to nil when type is changed' do+ section = Spree::CmsSection.find(side_by_side_images_section.id)- section.content[:link_type_one] = 'Spree::Taxon'- section.content[:link_type_two] = 'Spree::Taxon'- section.save!- section.reload+ section.content[:link_type_one] = 'Spree::Taxon'+ section.content[:link_type_two] = 'Spree::Taxon'+ section.save!+ section.reload- expect(section.link_one).to be nil- expect(section.link_two).to be nil- end+ expect(section.link_one).to be nil+ expect(section.link_two).to be nilendendenddiff --git a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb b/core/spec/services/spree/stock_locations/stock_items/create_spec.rbindex 6df6441aa9..642251b045 100644--- a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb+++ b/core/spec/services/spree/stock_locations/stock_items/create_spec.rb@@ -10,91 +10,70 @@ module Spreelet(:stock_location_class) { stock_location.class }describe '#call' do- context 'Rails < 6', if: Rails::VERSION::MAJOR < 6 do- context 'with variants to propagate' do- before { stock_location.stock_items.delete_all }+ let(:time_current) { Time.local(1990) }- it 'propagates the variants' do- expect { result }.to change { stock_location.stock_items.count }.from(0).to(4)- end- end-- context 'without variants to propagate' do- before { Variant.destroy_all }+ context 'with prepared stock items' do+ context 'with stock items in the db' do+ before { Spree::StockItem.find(Spree::StockItem.ids.sample).delete }- it 'does not propagate stock location variants' do- expect(stock_location).not_to receive(:propagate_variant)- result+ it 'inserts stock items without duplicates' do+ total_stock_items = Spree::StockItem.count+ expect { result }.to change {+ stock_location.stock_items.count+ }.from(total_stock_items).to(total_stock_items + 1)endend- end-- context 'Rails >= 6', if: Rails::VERSION::MAJOR >= 6 do- let(:time_current) { Time.local(1990) }- context 'with prepared stock items' do- context 'with stock items in the db' do- before { Spree::StockItem.find(Spree::StockItem.ids.sample).delete }+ context 'without stock items in the db' do+ before do+ # Delete all stock_location.stock_items to start counting from 0.+ stock_location.stock_items.unscope(:where).delete_all+ end- it 'inserts stock items without duplicates' do- total_stock_items = Spree::StockItem.count- expect { result }.to change {- stock_location.stock_items.count- }.from(total_stock_items).to(total_stock_items + 1)- end+ let(:created_stock_item) { stock_location.stock_items.order(:id).last }+ let(:created_stock_item_attrs) do+ created_stock_item.attributes.values_at(+ 'stock_location_id', 'variant_id', 'backorderable', 'created_at', 'updated_at'+ )end- context 'without stock items in the db' do- before do- # Delete all stock_location.stock_items to start counting from 0.- stock_location.stock_items.unscope(:where).delete_all- end+ it 'inserts the stock location stock items' do+ expect { result }.to change { stock_location.stock_items.count }.from(0).to(4)+ end- let(:created_stock_item) { stock_location.stock_items.order(:id).last }- let(:created_stock_item_attrs) do- created_stock_item.attributes.values_at(- 'stock_location_id', 'variant_id', 'backorderable', 'created_at', 'updated_at'+ it 'sets the stock location data necessary for the inserted stock items' do+ Timecop.freeze(time_current) do+ result+ expect(created_stock_item_attrs).to(+ eq([+ stock_location.id,+ unrelated_variant.id,+ stock_location.backorderable_default,+ time_current,+ time_current+ ]))end+ end- it 'inserts the stock location stock items' do- expect { result }.to change { stock_location.stock_items.count }.from(0).to(4)- end-- it 'sets the stock location data necessary for the inserted stock items' do- Timecop.freeze(time_current) do- result- expect(created_stock_item_attrs).to(- eq([- stock_location.id,- unrelated_variant.id,- stock_location.backorderable_default,- time_current,- time_current- ])- )- end- end-- it 'invalidates the Variant cache' do- expect(Spree::Variant).to receive(:touch_all).once- result- end+ it 'invalidates the Variant cache' do+ expect(Spree::Variant).to receive(:touch_all).once+ resultendend+ end- context 'without prepared stock items' do- before { Spree::Variant.destroy_all }+ context 'without prepared stock items' do+ before { Spree::Variant.destroy_all }- it 'does not insert stock items' do- expect(stock_location.stock_items).not_to receive(:insert_all)- result- end+ it 'does not insert stock items' do+ expect(stock_location.stock_items).not_to receive(:insert_all)+ result+ end- it 'does not invalidates the Variant cache' do- expect(Spree::Variant).not_to receive(:touch_all)- result- end+ it 'does not invalidates the Variant cache' do+ expect(Spree::Variant).not_to receive(:touch_all)+ resultendendend