diff --git a/engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb b/engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb
index 823ed5d6b1..c6d43be45f 100644
--- a/engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb
+++ b/engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Catalog
   module ProductImport
-    describe ProductsResetStrategy do
+    RSpec.describe ProductsResetStrategy do
       let(:products_reset) { described_class.new(excluded_items_ids) }
 
       describe '#reset' do
diff --git a/engines/dfc_provider/spec/requests/addresses_spec.rb b/engines/dfc_provider/spec/requests/addresses_spec.rb
index 21032e5df9..9e8693b03c 100644
--- a/engines/dfc_provider/spec/requests/addresses_spec.rb
+++ b/engines/dfc_provider/spec/requests/addresses_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "Addresses", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "Addresses", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let(:user) { create(:oidc_user) }
   let(:address) { create(:address, id: 40_000) }
   let(:result) { json_response }
diff --git a/engines/dfc_provider/spec/requests/catalog_items_spec.rb b/engines/dfc_provider/spec/requests/catalog_items_spec.rb
index f047812e00..1405a5b0a5 100644
--- a/engines/dfc_provider/spec/requests/catalog_items_spec.rb
+++ b/engines/dfc_provider/spec/requests/catalog_items_spec.rb
@@ -2,8 +2,8 @@
 
 require_relative "../swagger_helper"
 
-describe "CatalogItems", type: :request, swagger_doc: "dfc.yaml",
-                         rswag_autodoc: true do
+RSpec.describe "CatalogItems", type: :request, swagger_doc: "dfc.yaml",
+                               rswag_autodoc: true do
   let(:user) { create(:oidc_user, id: 12_345) }
   let(:enterprise) {
     create(
diff --git a/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb b/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb
index 4230fe2b29..fdee727fa8 100644
--- a/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb
+++ b/engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb
@@ -2,8 +2,8 @@
 
 require_relative "../../swagger_helper"
 
-describe "EnterpriseGroups::AffiliatedBy", type: :request, swagger_doc: "dfc.yaml",
-                                           rswag_autodoc: true do
+RSpec.describe "EnterpriseGroups::AffiliatedBy", type: :request, swagger_doc: "dfc.yaml",
+                                                 rswag_autodoc: true do
   let(:user) { create(:oidc_user, id: 12_345) }
   let(:group) {
     create(
diff --git a/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb b/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb
index 80f734d92e..8b3f161893 100644
--- a/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb
+++ b/engines/dfc_provider/spec/requests/enterprise_groups_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "EnterpriseGroups", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "EnterpriseGroups", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let(:user) { create(:oidc_user, id: 12_345) }
   let(:group) {
     create(
diff --git a/engines/dfc_provider/spec/requests/enterprises_spec.rb b/engines/dfc_provider/spec/requests/enterprises_spec.rb
index c205bc62a9..9785361aa6 100644
--- a/engines/dfc_provider/spec/requests/enterprises_spec.rb
+++ b/engines/dfc_provider/spec/requests/enterprises_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "Enterprises", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "Enterprises", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let!(:user) { create(:oidc_user) }
   let!(:enterprise) do
     create(
diff --git a/engines/dfc_provider/spec/requests/offers_spec.rb b/engines/dfc_provider/spec/requests/offers_spec.rb
index 826df7be76..f309613c0c 100644
--- a/engines/dfc_provider/spec/requests/offers_spec.rb
+++ b/engines/dfc_provider/spec/requests/offers_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "Offers", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "Offers", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let!(:user) { create(:oidc_user) }
   let!(:enterprise) { create(:distributor_enterprise, id: 10_000, owner: user) }
   let!(:product) {
diff --git a/engines/dfc_provider/spec/requests/persons_spec.rb b/engines/dfc_provider/spec/requests/persons_spec.rb
index 3af17b76e9..a7ef52c0c4 100644
--- a/engines/dfc_provider/spec/requests/persons_spec.rb
+++ b/engines/dfc_provider/spec/requests/persons_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "Persons", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "Persons", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let(:user) { create(:oidc_user, id: 10_000) }
   let(:other_user) { create(:oidc_user) }
 
diff --git a/engines/dfc_provider/spec/requests/social_medias_spec.rb b/engines/dfc_provider/spec/requests/social_medias_spec.rb
index 4211e5f455..71e7bfdbee 100644
--- a/engines/dfc_provider/spec/requests/social_medias_spec.rb
+++ b/engines/dfc_provider/spec/requests/social_medias_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "SocialMedias", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "SocialMedias", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let(:user) { create(:oidc_user) }
   let(:enterprise) do
     create(
diff --git a/engines/dfc_provider/spec/requests/supplied_products_spec.rb b/engines/dfc_provider/spec/requests/supplied_products_spec.rb
index d57d45c0f0..e72e13017f 100644
--- a/engines/dfc_provider/spec/requests/supplied_products_spec.rb
+++ b/engines/dfc_provider/spec/requests/supplied_products_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../swagger_helper"
 
-describe "SuppliedProducts", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
+RSpec.describe "SuppliedProducts", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: true do
   let!(:user) { create(:oidc_user) }
   let!(:enterprise) { create(:distributor_enterprise, id: 10_000, owner: user) }
   let!(:product) {
diff --git a/engines/dfc_provider/spec/services/address_builder_spec.rb b/engines/dfc_provider/spec/services/address_builder_spec.rb
index 134e08e998..89020de3e7 100644
--- a/engines/dfc_provider/spec/services/address_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/address_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe AddressBuilder do
+RSpec.describe AddressBuilder do
   subject(:result) { described_class.address(address) }
   let(:address) {
     build(
diff --git a/engines/dfc_provider/spec/services/authorization_control_spec.rb b/engines/dfc_provider/spec/services/authorization_control_spec.rb
index 97cd646df3..f5695f0cd6 100644
--- a/engines/dfc_provider/spec/services/authorization_control_spec.rb
+++ b/engines/dfc_provider/spec/services/authorization_control_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe AuthorizationControl do
+RSpec.describe AuthorizationControl do
   include AuthorizationHelper
 
   let(:user) { create(:oidc_user) }
diff --git a/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb b/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb
index ed80ac34a1..7c1b4d2c0f 100644
--- a/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/catalog_item_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe DfcBuilder do
+RSpec.describe DfcBuilder do
   let(:variant) { build(:variant) }
 
   describe ".catalog_item" do
diff --git a/engines/dfc_provider/spec/services/dfc_io_spec.rb b/engines/dfc_provider/spec/services/dfc_io_spec.rb
index e95801853c..58194ce204 100644
--- a/engines/dfc_provider/spec/services/dfc_io_spec.rb
+++ b/engines/dfc_provider/spec/services/dfc_io_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe DfcIo do
+RSpec.describe DfcIo do
   let(:person) do
     DataFoodConsortium::Connector::Person.new("Pete")
   end
diff --git a/engines/dfc_provider/spec/services/dfc_loader_spec.rb b/engines/dfc_provider/spec/services/dfc_loader_spec.rb
index c36f05f75f..93ae98de9d 100644
--- a/engines/dfc_provider/spec/services/dfc_loader_spec.rb
+++ b/engines/dfc_provider/spec/services/dfc_loader_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe DfcLoader do
+RSpec.describe DfcLoader do
   it "prepares the DFC Connector to provide DFC object classes for export" do
     tomato = DataFoodConsortium::Connector::SuppliedProduct.new(
       "https://openfoodnetwork.org/tomato",
diff --git a/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb b/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb
index be4fa4342b..191046c294 100644
--- a/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb
+++ b/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe DfcProductTypeFactory do
+RSpec.describe DfcProductTypeFactory do
   describe ".for" do
     let(:dfc_id) {
       "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#drink"
diff --git a/engines/dfc_provider/spec/services/dfc_request_spec.rb b/engines/dfc_provider/spec/services/dfc_request_spec.rb
index a4f0421fad..d1e82d17ef 100644
--- a/engines/dfc_provider/spec/services/dfc_request_spec.rb
+++ b/engines/dfc_provider/spec/services/dfc_request_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe DfcRequest do
+RSpec.describe DfcRequest do
   subject(:api) { DfcRequest.new(user) }
 
   let(:user) { build(:oidc_user) }
diff --git a/engines/dfc_provider/spec/services/enterprise_builder_spec.rb b/engines/dfc_provider/spec/services/enterprise_builder_spec.rb
index 8e24ed4fd1..cc26fe767b 100644
--- a/engines/dfc_provider/spec/services/enterprise_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/enterprise_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe EnterpriseBuilder do
+RSpec.describe EnterpriseBuilder do
   subject(:builder) { described_class }
   let(:enterprise) {
     build(
diff --git a/engines/dfc_provider/spec/services/offer_builder_spec.rb b/engines/dfc_provider/spec/services/offer_builder_spec.rb
index 15ef9c4dda..0fd9732d47 100644
--- a/engines/dfc_provider/spec/services/offer_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/offer_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe OfferBuilder do
+RSpec.describe OfferBuilder do
   let(:variant) { build(:variant) }
 
   describe ".offer" do
diff --git a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
index 39f2a8d8a7..4c5403e7e7 100644
--- a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe QuantitativeValueBuilder do
+RSpec.describe QuantitativeValueBuilder do
   subject(:builder) { described_class }
   let(:variant) { build(:variant, product:) }
   let(:product) { build(:product, name: "Apple") }
diff --git a/engines/dfc_provider/spec/services/social_media_builder_spec.rb b/engines/dfc_provider/spec/services/social_media_builder_spec.rb
index 633ce732d8..85d440d0e0 100644
--- a/engines/dfc_provider/spec/services/social_media_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/social_media_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe SocialMediaBuilder do
+RSpec.describe SocialMediaBuilder do
   let(:enterprise) do
     create(
       :enterprise,
diff --git a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb b/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb
index 12bc49f518..3e582a7aa4 100644
--- a/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb
+++ b/engines/dfc_provider/spec/services/supplied_product_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "../spec_helper"
 
-describe SuppliedProductBuilder do
+RSpec.describe SuppliedProductBuilder do
   include FileHelper
 
   subject(:builder) { described_class }
diff --git a/engines/order_management/spec/services/order_management/order/stripe_sca_payment_authorize_spec.rb b/engines/order_management/spec/services/order_management/order/stripe_sca_payment_authorize_spec.rb
index afe866f15b..338d938a1a 100644
--- a/engines/order_management/spec/services/order_management/order/stripe_sca_payment_authorize_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/stripe_sca_payment_authorize_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Order
-    describe StripeScaPaymentAuthorize do
+    RSpec.describe StripeScaPaymentAuthorize do
       let(:order) { create(:order) }
       let(:payment_authorize) {
         OrderManagement::Order::StripeScaPaymentAuthorize.new(order)
diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
index 6c2542b9e0..4b1eb0689e 100644
--- a/engines/order_management/spec/services/order_management/order/updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Order
-    describe Updater do
+    RSpec.describe Updater do
       let(:order) { create(:order) }
       let(:updater) { OrderManagement::Order::Updater.new(order) }
 
diff --git a/engines/order_management/spec/services/order_management/stock/coordinator_spec.rb b/engines/order_management/spec/services/order_management/stock/coordinator_spec.rb
index ee93585dd6..9acc53675f 100644
--- a/engines/order_management/spec/services/order_management/stock/coordinator_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/coordinator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Stock
-    describe Coordinator do
+    RSpec.describe Coordinator do
       let!(:order) do
         build_stubbed(
           :order_with_line_items,
diff --git a/engines/order_management/spec/services/order_management/stock/estimator_spec.rb b/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
index 042b4958d2..0c31ebe454 100644
--- a/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Stock
-    describe Estimator do
+    RSpec.describe Estimator do
       let!(:shipping_method) { create(:shipping_method, zones: [create(:zone)] ) }
       let(:package) { build(:stock_package_fulfilled) }
       let(:order) { package.order }
diff --git a/engines/order_management/spec/services/order_management/stock/package_spec.rb b/engines/order_management/spec/services/order_management/stock/package_spec.rb
index 64a9fd46d3..22b97eb1ff 100644
--- a/engines/order_management/spec/services/order_management/stock/package_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/package_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Stock
-    describe Package do
+    RSpec.describe Package do
       context "base tests" do
         let(:variant) { build(:variant, weight: 25.0) }
         let(:stock_location) { build(:stock_location) }
diff --git a/engines/order_management/spec/services/order_management/stock/packer_spec.rb b/engines/order_management/spec/services/order_management/stock/packer_spec.rb
index 80666eb3d4..1b0895bc28 100644
--- a/engines/order_management/spec/services/order_management/stock/packer_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/packer_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Stock
-    describe Packer do
+    RSpec.describe Packer do
       let(:distributor) { create(:distributor_enterprise) }
       let(:order) { create(:order_with_line_items, line_items_count: 5, distributor:) }
       let(:stock_location) { create(:stock_location) }
diff --git a/engines/order_management/spec/services/order_management/stock/prioritizer_spec.rb b/engines/order_management/spec/services/order_management/stock/prioritizer_spec.rb
index b1783eb734..c521eaad84 100644
--- a/engines/order_management/spec/services/order_management/stock/prioritizer_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/prioritizer_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Stock
-    describe Prioritizer do
+    RSpec.describe Prioritizer do
       let(:order) { create(:order_with_line_items, line_items_count: 2) }
       let(:stock_location) { build(:stock_location) }
       let(:variant1) { order.line_items[0].variant }
diff --git a/engines/order_management/spec/services/order_management/subscriptions/count_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/count_spec.rb
index 75b4e47111..a852130932 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/count_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/count_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe Count do
+    RSpec.describe Count do
       let(:oc1) { create(:simple_order_cycle) }
       let(:oc2) { create(:simple_order_cycle) }
       let(:subscriptions_count) { Count.new(order_cycles) }
diff --git a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
index 238aa8e322..5a4c91f71d 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe Estimator do
+    RSpec.describe Estimator do
       describe "estimating prices for subscription line items" do
         let!(:subscription) { create(:subscription, with_items: true) }
         let!(:sli1) { subscription.subscription_line_items.first }
diff --git a/engines/order_management/spec/services/order_management/subscriptions/form_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
index 56122e12e6..c915ff0e99 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe Form do
+    RSpec.describe Form do
       describe "creating a new subscription" do
         let!(:shop) { create(:distributor_enterprise) }
         let!(:customer) { create(:customer, enterprise: shop) }
diff --git a/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb
index 035021eb49..297fc841a7 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe PaymentSetup do
+    RSpec.describe PaymentSetup do
       let(:order) { create(:order) }
       let(:payment_setup) { OrderManagement::Subscriptions::PaymentSetup.new(order) }
 
diff --git a/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
index fcf06793df..91dcc2a32a 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe ProxyOrderSyncer do
+    RSpec.describe ProxyOrderSyncer do
       describe "initialization" do
         let!(:subscription) { create(:subscription) }
 
diff --git a/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb
index 9c4e97157c..6db96cf112 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe StripePaymentSetup do
+    RSpec.describe StripePaymentSetup do
       let(:order) { create(:order) }
       let(:payment_setup) { OrderManagement::Subscriptions::StripePaymentSetup.new(order) }
 
diff --git a/engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
index 8333eda906..a442a76f6f 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe Summarizer do
+    RSpec.describe Summarizer do
       let(:order) { create(:order) }
       let(:summarizer) { OrderManagement::Subscriptions::Summarizer.new }
 
diff --git a/engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb
index 6aeb292bf2..5c877800a5 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module OrderManagement
   module Subscriptions
-    describe Summary do
+    RSpec.describe Summary do
       let(:summary) { OrderManagement::Subscriptions::Summary.new(123) }
 
       describe "#initialize" do
diff --git a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
index 55e4d28944..2d76ac4ace 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
@@ -4,7 +4,7 @@ require "spec_helper"
 
 module OrderManagement
   module Subscriptions
-    describe Validator do
+    RSpec.describe Validator do
       let(:owner) { create(:user) }
       let(:shop) { create(:enterprise, name: "Shop", owner:) }
 
diff --git a/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
index dc51f14f8e..bb95c0dc77 100644
--- a/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
+++ b/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
@@ -4,7 +4,7 @@ require "spec_helper"
 
 module OrderManagement
   module Subscriptions
-    describe VariantsList do
+    RSpec.describe VariantsList do
       describe "variant eligibility for subscription" do
         let!(:shop) { create(:distributor_enterprise) }
         let!(:producer) { create(:supplier_enterprise) }
diff --git a/engines/web/spec/helpers/cookies_policy_helper_spec.rb b/engines/web/spec/helpers/cookies_policy_helper_spec.rb
index 02ff9910a0..81a779c7dd 100644
--- a/engines/web/spec/helpers/cookies_policy_helper_spec.rb
+++ b/engines/web/spec/helpers/cookies_policy_helper_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Web
-  describe CookiesPolicyHelper, type: :helper do
+  RSpec.describe CookiesPolicyHelper, type: :helper do
     # keeps global state unchanged
     around do |example|
       original_locale = I18n.locale
diff --git a/spec/base_spec_helper.rb b/spec/base_spec_helper.rb
index 7412ba4dec..bfa70791e5 100644
--- a/spec/base_spec_helper.rb
+++ b/spec/base_spec_helper.rb
@@ -124,6 +124,11 @@ RSpec.configure do |config|
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
+  config.disable_monkey_patching!
+
   # Reset locale for all specs.
   config.around(:each) do |example|
     I18n.with_locale(:en) { example.run }
diff --git a/spec/components/distributor_title_component_spec.rb b/spec/components/distributor_title_component_spec.rb
index b678027f49..c88b76eb67 100644
--- a/spec/components/distributor_title_component_spec.rb
+++ b/spec/components/distributor_title_component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "DistributorTitle tests", type: :component do
+RSpec.describe "DistributorTitle tests", type: :component do
   it "displays distributor title with its name" do
     render_inline(DistributorTitleComponent.new(name: "Freddy's Farm Shop")) {}
     expect(page).to have_selector "h3", text: "Freddy's Farm Shop"
diff --git a/spec/components/example_component_spec.rb b/spec/components/example_component_spec.rb
index f40eeb5ee8..540d7a4364 100644
--- a/spec/components/example_component_spec.rb
+++ b/spec/components/example_component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "ExampleComponent tests", type: :component do
+RSpec.describe "ExampleComponent tests", type: :component do
   it "displays the h1 with the given parameter" do
     render_inline(ExampleComponent.new(title: "Hello")) {}
     expect(page).to have_selector "h1", text: "Hello"
diff --git a/spec/components/vertical_ellipsis_menu_component_spec.rb b/spec/components/vertical_ellipsis_menu_component_spec.rb
index cdbdea159f..3f8a37bab1 100644
--- a/spec/components/vertical_ellipsis_menu_component_spec.rb
+++ b/spec/components/vertical_ellipsis_menu_component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe VerticalEllipsisMenu::Component, type: :component do
+RSpec.describe VerticalEllipsisMenu::Component, type: :component do
   it "displays the included links" do
     content = "<a href>Edit</a>"
     render_inline(described_class.new.with_content(content.html_safe))
diff --git a/spec/constraints/feature_toggle_constraint_spec.rb b/spec/constraints/feature_toggle_constraint_spec.rb
index 4c9e477d17..6738c64480 100644
--- a/spec/constraints/feature_toggle_constraint_spec.rb
+++ b/spec/constraints/feature_toggle_constraint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FeatureToggleConstraint do
+RSpec.describe FeatureToggleConstraint do
   subject { described_class.new("baking") }
   let(:request) { double(env:) }
   let(:env) { {} }
diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb
index 15e540c97b..1a3a4d2852 100644
--- a/spec/controllers/admin/bulk_line_items_controller_spec.rb
+++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::BulkLineItemsController, type: :controller do
+RSpec.describe Admin::BulkLineItemsController, type: :controller do
   describe '#index' do
     render_views
 
diff --git a/spec/controllers/admin/column_preferences_controller_spec.rb b/spec/controllers/admin/column_preferences_controller_spec.rb
index 0c46af6ecd..41f34b163e 100644
--- a/spec/controllers/admin/column_preferences_controller_spec.rb
+++ b/spec/controllers/admin/column_preferences_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ColumnPreferencesController, type: :controller do
+RSpec.describe Admin::ColumnPreferencesController, type: :controller do
   include AuthenticationHelper
 
   describe "bulk_update" do
diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb
index f7397e58ab..d8d464fcb0 100644
--- a/spec/controllers/admin/customers_controller_spec.rb
+++ b/spec/controllers/admin/customers_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Admin
-  describe CustomersController, type: :controller do
+  RSpec.describe CustomersController, type: :controller do
     include AuthenticationHelper
 
     describe "index" do
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index 9c033da706..4caf3e38d7 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
-describe Admin::EnterprisesController, type: :controller do
+RSpec.describe Admin::EnterprisesController, type: :controller do
   let(:user) { create(:user) }
   let(:admin_user) { create(:admin_user) }
   let(:distributor_manager) { create(:user, enterprise_limit: 10, enterprises: [distributor]) }
diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb
index cf29a2d39c..8375a89bbd 100644
--- a/spec/controllers/admin/inventory_items_controller_spec.rb
+++ b/spec/controllers/admin/inventory_items_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::InventoryItemsController, type: :controller do
+RSpec.describe Admin::InventoryItemsController, type: :controller do
   describe "create" do
     context "json" do
       let(:format) { :json }
diff --git a/spec/controllers/admin/invoice_settings_controller_spec.rb b/spec/controllers/admin/invoice_settings_controller_spec.rb
index b575d822d4..de8edc2a62 100644
--- a/spec/controllers/admin/invoice_settings_controller_spec.rb
+++ b/spec/controllers/admin/invoice_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::InvoiceSettingsController, type: :controller do
+RSpec.describe Admin::InvoiceSettingsController, type: :controller do
   describe "#update" do
     let(:params) {
       {
diff --git a/spec/controllers/admin/matomo_settings_controller_spec.rb b/spec/controllers/admin/matomo_settings_controller_spec.rb
index 26b5f8d604..f488bd9637 100644
--- a/spec/controllers/admin/matomo_settings_controller_spec.rb
+++ b/spec/controllers/admin/matomo_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::MatomoSettingsController, type: :controller do
+RSpec.describe Admin::MatomoSettingsController, type: :controller do
   describe "#update" do
     let(:params) {
       {
diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb
index fd154b7118..aaeafbd8d7 100644
--- a/spec/controllers/admin/order_cycles_controller_spec.rb
+++ b/spec/controllers/admin/order_cycles_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Admin
-  describe OrderCyclesController, type: :controller do
+  RSpec.describe OrderCyclesController, type: :controller do
     let!(:distributor_owner) { create(:user) }
 
     before do
diff --git a/spec/controllers/admin/product_import_controller_spec.rb b/spec/controllers/admin/product_import_controller_spec.rb
index 88f6793ad5..404e4ed763 100644
--- a/spec/controllers/admin/product_import_controller_spec.rb
+++ b/spec/controllers/admin/product_import_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProductImportController, type: :controller do
+RSpec.describe Admin::ProductImportController, type: :controller do
   describe 'validate_file_path' do
     context 'file extension' do
       it 'should authorize csv extension' do
diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb
index 6e505530b6..7882fd96c4 100644
--- a/spec/controllers/admin/proxy_orders_controller_spec.rb
+++ b/spec/controllers/admin/proxy_orders_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProxyOrdersController, type: :controller do
+RSpec.describe Admin::ProxyOrdersController, type: :controller do
   include AuthenticationHelper
 
   describe 'cancel' do
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 318682a8e8..5e80fe5f68 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ReportsController, type: :controller do
+RSpec.describe Admin::ReportsController, type: :controller do
   # Given two distributors and two suppliers
   let(:bill_address) { create(:address) }
   let(:ship_address) { create(:address) }
diff --git a/spec/controllers/admin/schedules_controller_spec.rb b/spec/controllers/admin/schedules_controller_spec.rb
index 38b1f12e35..c47b9e7bc8 100644
--- a/spec/controllers/admin/schedules_controller_spec.rb
+++ b/spec/controllers/admin/schedules_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SchedulesController, type: :controller do
+RSpec.describe Admin::SchedulesController, type: :controller do
   include AuthenticationHelper
 
   describe "index" do
diff --git a/spec/controllers/admin/stripe_accounts_controller_spec.rb b/spec/controllers/admin/stripe_accounts_controller_spec.rb
index a1b5df8d69..97aa99a895 100644
--- a/spec/controllers/admin/stripe_accounts_controller_spec.rb
+++ b/spec/controllers/admin/stripe_accounts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::StripeAccountsController, type: :controller do
+RSpec.describe Admin::StripeAccountsController, type: :controller do
   let(:enterprise) { create(:distributor_enterprise) }
 
   describe "#connect" do
diff --git a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
index c6e99d47a8..ac56335e2d 100644
--- a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
+++ b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::StripeConnectSettingsController, type: :controller do
+RSpec.describe Admin::StripeConnectSettingsController, type: :controller do
   let(:user) { create(:user) }
   let(:admin) { create(:admin_user) }
 
diff --git a/spec/controllers/admin/subscription_line_items_controller_spec.rb b/spec/controllers/admin/subscription_line_items_controller_spec.rb
index 1ac8b006d8..0a015046f2 100644
--- a/spec/controllers/admin/subscription_line_items_controller_spec.rb
+++ b/spec/controllers/admin/subscription_line_items_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SubscriptionLineItemsController, type: :controller do
+RSpec.describe Admin::SubscriptionLineItemsController, type: :controller do
   include AuthenticationHelper
 
   describe "build" do
diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb
index c00d8ae113..3beaf5f5d5 100644
--- a/spec/controllers/admin/subscriptions_controller_spec.rb
+++ b/spec/controllers/admin/subscriptions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SubscriptionsController, type: :controller do
+RSpec.describe Admin::SubscriptionsController, type: :controller do
   include AuthenticationHelper
 
   describe 'index' do
diff --git a/spec/controllers/admin/tag_rules_controller_spec.rb b/spec/controllers/admin/tag_rules_controller_spec.rb
index 9f789c1784..66930b43ce 100644
--- a/spec/controllers/admin/tag_rules_controller_spec.rb
+++ b/spec/controllers/admin/tag_rules_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::TagRulesController, type: :controller do
+RSpec.describe Admin::TagRulesController, type: :controller do
   describe "destroy" do
     context "json" do
       let(:format) { :json }
diff --git a/spec/controllers/admin/terms_of_service_files_controller_spec.rb b/spec/controllers/admin/terms_of_service_files_controller_spec.rb
index de6b0ba174..dac296ea95 100644
--- a/spec/controllers/admin/terms_of_service_files_controller_spec.rb
+++ b/spec/controllers/admin/terms_of_service_files_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::TermsOfServiceFilesController, type: :controller do
+RSpec.describe Admin::TermsOfServiceFilesController, type: :controller do
   context "a non-admin user" do
     let(:user) { create(:user) }
 
diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb
index 4224452fb1..7e37e63d60 100644
--- a/spec/controllers/admin/variant_overrides_controller_spec.rb
+++ b/spec/controllers/admin/variant_overrides_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::VariantOverridesController, type: :controller do
+RSpec.describe Admin::VariantOverridesController, type: :controller do
   describe "bulk_update" do
     context "json" do
       let(:format) { :json }
diff --git a/spec/controllers/api/v0/base_controller_spec.rb b/spec/controllers/api/v0/base_controller_spec.rb
index ae57801550..e98ab3e4f6 100644
--- a/spec/controllers/api/v0/base_controller_spec.rb
+++ b/spec/controllers/api/v0/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::BaseController do
+RSpec.describe Api::V0::BaseController do
   render_views
   controller(Api::V0::BaseController) do
     skip_authorization_check only: :index
diff --git a/spec/controllers/api/v0/customers_controller_spec.rb b/spec/controllers/api/v0/customers_controller_spec.rb
index 83bd201b4f..b232bdea45 100644
--- a/spec/controllers/api/v0/customers_controller_spec.rb
+++ b/spec/controllers/api/v0/customers_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::CustomersController, type: :controller do
+  RSpec.describe V0::CustomersController, type: :controller do
     include AuthenticationHelper
     render_views
 
diff --git a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
index 40ed1e78e2..06a7b564fe 100644
--- a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
+++ b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::EnterpriseFeesController, type: :controller do
+  RSpec.describe V0::EnterpriseFeesController, type: :controller do
     include AuthenticationHelper
 
     let!(:unreferenced_fee) { create(:enterprise_fee) }
diff --git a/spec/controllers/api/v0/enterprises_controller_spec.rb b/spec/controllers/api/v0/enterprises_controller_spec.rb
index b930acfeaf..d0529f3eeb 100644
--- a/spec/controllers/api/v0/enterprises_controller_spec.rb
+++ b/spec/controllers/api/v0/enterprises_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::EnterprisesController, type: :controller do
+RSpec.describe Api::V0::EnterprisesController, type: :controller do
   render_views
 
   let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/controllers/api/v0/exchange_products_controller_spec.rb b/spec/controllers/api/v0/exchange_products_controller_spec.rb
index 18c04f3825..ea226a80f1 100644
--- a/spec/controllers/api/v0/exchange_products_controller_spec.rb
+++ b/spec/controllers/api/v0/exchange_products_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::ExchangeProductsController, type: :controller do
+  RSpec.describe V0::ExchangeProductsController, type: :controller do
     include AuthenticationHelper
 
     let(:order_cycle) { create(:order_cycle) }
diff --git a/spec/controllers/api/v0/logos_controller_spec.rb b/spec/controllers/api/v0/logos_controller_spec.rb
index 3d8c800ba0..323c11c4ea 100644
--- a/spec/controllers/api/v0/logos_controller_spec.rb
+++ b/spec/controllers/api/v0/logos_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  describe V0::LogosController, type: :controller do
+  RSpec.describe V0::LogosController, type: :controller do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/order_cycles_controller_spec.rb b/spec/controllers/api/v0/order_cycles_controller_spec.rb
index a8640fa581..c6c9257cfe 100644
--- a/spec/controllers/api/v0/order_cycles_controller_spec.rb
+++ b/spec/controllers/api/v0/order_cycles_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  describe V0::OrderCyclesController, type: :controller do
+  RSpec.describe V0::OrderCyclesController, type: :controller do
     let!(:distributor) { create(:distributor_enterprise) }
     let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
     let!(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
diff --git a/spec/controllers/api/v0/orders_controller_spec.rb b/spec/controllers/api/v0/orders_controller_spec.rb
index d727221cfe..5f955cd573 100644
--- a/spec/controllers/api/v0/orders_controller_spec.rb
+++ b/spec/controllers/api/v0/orders_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::OrdersController, type: :controller do
+  RSpec.describe V0::OrdersController, type: :controller do
     include AuthenticationHelper
     render_views
 
diff --git a/spec/controllers/api/v0/product_images_controller_spec.rb b/spec/controllers/api/v0/product_images_controller_spec.rb
index 2c0a380bee..d010e7b615 100644
--- a/spec/controllers/api/v0/product_images_controller_spec.rb
+++ b/spec/controllers/api/v0/product_images_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::ProductImagesController, type: :controller do
+RSpec.describe Api::V0::ProductImagesController, type: :controller do
   include AuthenticationHelper
   include FileHelper
   render_views
diff --git a/spec/controllers/api/v0/products_controller_spec.rb b/spec/controllers/api/v0/products_controller_spec.rb
index 4abba9f3bd..bd796be1ea 100644
--- a/spec/controllers/api/v0/products_controller_spec.rb
+++ b/spec/controllers/api/v0/products_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'spree/core/product_duplicator'
 
-describe Api::V0::ProductsController, type: :controller do
+RSpec.describe Api::V0::ProductsController, type: :controller do
   render_views
 
   let(:supplier) { create(:supplier_enterprise) }
diff --git a/spec/controllers/api/v0/promo_images_controller_spec.rb b/spec/controllers/api/v0/promo_images_controller_spec.rb
index 76e7288ae1..0b3d173efb 100644
--- a/spec/controllers/api/v0/promo_images_controller_spec.rb
+++ b/spec/controllers/api/v0/promo_images_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  describe V0::PromoImagesController, type: :controller do
+  RSpec.describe V0::PromoImagesController, type: :controller do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb
index a88a26c7d0..1b35ddbe66 100644
--- a/spec/controllers/api/v0/reports/packing_report_spec.rb
+++ b/spec/controllers/api/v0/reports/packing_report_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::V0::ReportsController, type: :controller do
+RSpec.describe Api::V0::ReportsController, type: :controller do
   let(:params) {
     {
       report_type: 'packing',
diff --git a/spec/controllers/api/v0/reports_controller_spec.rb b/spec/controllers/api/v0/reports_controller_spec.rb
index e50c55cbdc..6c6000300d 100644
--- a/spec/controllers/api/v0/reports_controller_spec.rb
+++ b/spec/controllers/api/v0/reports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::V0::ReportsController, type: :controller do
+RSpec.describe Api::V0::ReportsController, type: :controller do
   let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) }
   let(:params) {
     {
diff --git a/spec/controllers/api/v0/shipments_controller_spec.rb b/spec/controllers/api/v0/shipments_controller_spec.rb
index add3d0c3ba..f7c9584e01 100644
--- a/spec/controllers/api/v0/shipments_controller_spec.rb
+++ b/spec/controllers/api/v0/shipments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::ShipmentsController, type: :controller do
+RSpec.describe Api::V0::ShipmentsController, type: :controller do
   render_views
 
   let!(:shipment) { create(:shipment) }
diff --git a/spec/controllers/api/v0/shops_controller_spec.rb b/spec/controllers/api/v0/shops_controller_spec.rb
index 2863aaef53..d1842ac53d 100644
--- a/spec/controllers/api/v0/shops_controller_spec.rb
+++ b/spec/controllers/api/v0/shops_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::ShopsController, type: :controller do
+RSpec.describe Api::V0::ShopsController, type: :controller do
   include AuthenticationHelper
   render_views
 
diff --git a/spec/controllers/api/v0/states_controller_spec.rb b/spec/controllers/api/v0/states_controller_spec.rb
index 19993200e2..e8f5267db8 100644
--- a/spec/controllers/api/v0/states_controller_spec.rb
+++ b/spec/controllers/api/v0/states_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::StatesController do
+  RSpec.describe V0::StatesController do
     render_views
 
     let!(:state) { create(:state, name: "Victoria") }
diff --git a/spec/controllers/api/v0/statuses_controller_spec.rb b/spec/controllers/api/v0/statuses_controller_spec.rb
index 32ef605a51..cf95869bac 100644
--- a/spec/controllers/api/v0/statuses_controller_spec.rb
+++ b/spec/controllers/api/v0/statuses_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::StatusesController, type: :controller do
+  RSpec.describe V0::StatusesController, type: :controller do
     render_views
 
     describe "job queue status" do
diff --git a/spec/controllers/api/v0/taxonomies_controller_spec.rb b/spec/controllers/api/v0/taxonomies_controller_spec.rb
index dfa5c2c25b..3426342ed5 100644
--- a/spec/controllers/api/v0/taxonomies_controller_spec.rb
+++ b/spec/controllers/api/v0/taxonomies_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  describe V0::TaxonomiesController do
+  RSpec.describe V0::TaxonomiesController do
     render_views
 
     let(:taxonomy) { create(:taxonomy) }
diff --git a/spec/controllers/api/v0/taxons_controller_spec.rb b/spec/controllers/api/v0/taxons_controller_spec.rb
index 6bd3fe8586..8666749deb 100644
--- a/spec/controllers/api/v0/taxons_controller_spec.rb
+++ b/spec/controllers/api/v0/taxons_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::TaxonsController do
+RSpec.describe Api::V0::TaxonsController do
   render_views
 
   let(:taxonomy) { create(:taxonomy) }
diff --git a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
index 53596f7fd3..1ca17ec0d9 100644
--- a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
+++ b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  describe V0::TermsAndConditionsController, type: :controller do
+  RSpec.describe V0::TermsAndConditionsController, type: :controller do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/variants_controller_spec.rb b/spec/controllers/api/v0/variants_controller_spec.rb
index 1a90dd704a..496af4d6b4 100644
--- a/spec/controllers/api/v0/variants_controller_spec.rb
+++ b/spec/controllers/api/v0/variants_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::V0::VariantsController, type: :controller do
+RSpec.describe Api::V0::VariantsController, type: :controller do
   render_views
 
   let(:supplier) { create(:supplier_enterprise) }
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index 5158dd1c3c..0c9ff572ad 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BaseController, type: :controller do
+RSpec.describe BaseController, type: :controller do
   let(:oc)    { instance_double(OrderCycle, id: 1) }
   let(:order) { instance_double(Spree::Order) }
   controller(BaseController) do
diff --git a/spec/controllers/cart_controller_spec.rb b/spec/controllers/cart_controller_spec.rb
index 70ef4fd4e5..07ac5c50e5 100644
--- a/spec/controllers/cart_controller_spec.rb
+++ b/spec/controllers/cart_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CartController, type: :controller do
+RSpec.describe CartController, type: :controller do
   let(:order) { create(:order) }
 
   describe "basic behaviour" do
diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb
index 4f948cdefa..7c4a158e4d 100644
--- a/spec/controllers/checkout_controller_spec.rb
+++ b/spec/controllers/checkout_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CheckoutController, type: :controller do
+RSpec.describe CheckoutController, type: :controller do
   let(:user) { order.user }
   let(:address) { create(:address) }
   let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
diff --git a/spec/controllers/concerns/address_transformation_spec.rb b/spec/controllers/concerns/address_transformation_spec.rb
index d8f9cf74c2..2f9f1d725e 100644
--- a/spec/controllers/concerns/address_transformation_spec.rb
+++ b/spec/controllers/concerns/address_transformation_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe AddressTransformation do
+RSpec.describe AddressTransformation do
   include AddressTransformation
 
   describe "#transform_address!" do
diff --git a/spec/controllers/concerns/extra_fields_spec.rb b/spec/controllers/concerns/extra_fields_spec.rb
index 463427926b..0c6d4a1569 100644
--- a/spec/controllers/concerns/extra_fields_spec.rb
+++ b/spec/controllers/concerns/extra_fields_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ExtraFields do
+RSpec.describe ExtraFields do
   let(:dummy_controller) { Api::V1::BaseController.new.extend ExtraFields }
 
   describe "#invalid_query_param" do
diff --git a/spec/controllers/concerns/raising_parameters_spec.rb b/spec/controllers/concerns/raising_parameters_spec.rb
index 73008f20cf..1a7badf85d 100644
--- a/spec/controllers/concerns/raising_parameters_spec.rb
+++ b/spec/controllers/concerns/raising_parameters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RaisingParameters do
+RSpec.describe RaisingParameters do
   describe "Parameters" do
     let(:params) do
       RaisingParameters::Parameters.new(
diff --git a/spec/controllers/enterprises_controller_spec.rb b/spec/controllers/enterprises_controller_spec.rb
index 3f50de9a39..014d21706b 100644
--- a/spec/controllers/enterprises_controller_spec.rb
+++ b/spec/controllers/enterprises_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterprisesController, type: :controller do
+RSpec.describe EnterprisesController, type: :controller do
   describe "shopping for a distributor" do
     let(:user) { create(:user) }
     let(:order) { controller.current_order(true) }
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 9240ba0cf8..a7d91c3522 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupsController, type: :controller do
+RSpec.describe GroupsController, type: :controller do
   render_views
 
   let!(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/controllers/line_items_controller_spec.rb b/spec/controllers/line_items_controller_spec.rb
index 28db84cd07..a825e77b35 100644
--- a/spec/controllers/line_items_controller_spec.rb
+++ b/spec/controllers/line_items_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LineItemsController, type: :controller do
+RSpec.describe LineItemsController, type: :controller do
   let(:user) { create(:user) }
   let(:distributor) { create(:distributor_enterprise) }
   let(:order_cycle) { create(:simple_order_cycle) }
diff --git a/spec/controllers/payment_gateways/paypal_controller_spec.rb b/spec/controllers/payment_gateways/paypal_controller_spec.rb
index d348054fde..8eb2fb2191 100644
--- a/spec/controllers/payment_gateways/paypal_controller_spec.rb
+++ b/spec/controllers/payment_gateways/paypal_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module PaymentGateways
-  describe PaypalController, type: :controller do
+  RSpec.describe PaypalController, type: :controller do
     context '#cancel' do
       it 'redirects back to checkout' do
         expect(get(:cancel)).to redirect_to checkout_path
diff --git a/spec/controllers/payment_gateways/stripe_controller_spec.rb b/spec/controllers/payment_gateways/stripe_controller_spec.rb
index 9b2e3233d9..5f7d086c9a 100644
--- a/spec/controllers/payment_gateways/stripe_controller_spec.rb
+++ b/spec/controllers/payment_gateways/stripe_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module PaymentGateways
-  describe StripeController, type: :controller do
+  RSpec.describe StripeController, type: :controller do
     include StripeStubs
 
     let!(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb
index 6fa9e867f4..bb87674ba9 100644
--- a/spec/controllers/registration_controller_spec.rb
+++ b/spec/controllers/registration_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RegistrationController, type: :controller do
+RSpec.describe RegistrationController, type: :controller do
   describe "redirecting when user not logged in" do
     it "index" do
       get :index
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index b072152e72..9431411a82 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ShopController, type: :controller do
+RSpec.describe ShopController, type: :controller do
   let!(:pm) { create(:payment_method) }
   let!(:sm) { create(:shipping_method) }
   let(:distributor) {
diff --git a/spec/controllers/shops_controller_spec.rb b/spec/controllers/shops_controller_spec.rb
index 97cea60cb9..a12a964038 100644
--- a/spec/controllers/shops_controller_spec.rb
+++ b/spec/controllers/shops_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ShopsController, type: :controller do
+RSpec.describe ShopsController, type: :controller do
   include WebHelper
   render_views
 
diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb
index a6ae890071..93837dbfb8 100644
--- a/spec/controllers/spree/admin/adjustments_controller_spec.rb
+++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Admin::AdjustmentsController, type: :controller do
+  RSpec.describe Admin::AdjustmentsController, type: :controller do
     include AuthenticationHelper
 
     before { controller_login_as_admin }
diff --git a/spec/controllers/spree/admin/base_controller_spec.rb b/spec/controllers/spree/admin/base_controller_spec.rb
index 21dbc71a4e..63844e9883 100644
--- a/spec/controllers/spree/admin/base_controller_spec.rb
+++ b/spec/controllers/spree/admin/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::BaseController, type: :controller do
+RSpec.describe Spree::Admin::BaseController, type: :controller do
   controller(Spree::Admin::BaseController) do
     def index
       before_action :unauthorized
diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb
index 87a9356f1e..d5829a9149 100644
--- a/spec/controllers/spree/admin/countries_controller_spec.rb
+++ b/spec/controllers/spree/admin/countries_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe CountriesController, type: :controller do
+    RSpec.describe CountriesController, type: :controller do
       include AuthenticationHelper
 
       describe "#update" do
diff --git a/spec/controllers/spree/admin/general_settings_controller_spec.rb b/spec/controllers/spree/admin/general_settings_controller_spec.rb
index 3fff115d01..1a0e0b002f 100644
--- a/spec/controllers/spree/admin/general_settings_controller_spec.rb
+++ b/spec/controllers/spree/admin/general_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::GeneralSettingsController, type: :controller do
+RSpec.describe Spree::Admin::GeneralSettingsController, type: :controller do
   include AuthenticationHelper
 
   describe 'updating general settings' do
diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
index 43ff49f9f0..163ec8f54b 100644
--- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::MailMethodsController do
+RSpec.describe Spree::Admin::MailMethodsController do
   include AuthenticationHelper
 
   before { controller_login_as_admin }
diff --git a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
index a19d2e942e..44b595b8ab 100644
--- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
+RSpec.describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
   include AuthenticationHelper
 
   describe "#update" do
diff --git a/spec/controllers/spree/admin/orders/invoices_spec.rb b/spec/controllers/spree/admin/orders/invoices_spec.rb
index 4aea9fd065..3eda9051a2 100644
--- a/spec/controllers/spree/admin/orders/invoices_spec.rb
+++ b/spec/controllers/spree/admin/orders/invoices_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::OrdersController, type: :controller do
+RSpec.describe Spree::Admin::OrdersController, type: :controller do
   describe "#invoice" do
     let!(:user) { create(:user) }
     let!(:enterprise_user) { create(:user) }
@@ -106,7 +106,7 @@ describe Spree::Admin::OrdersController, type: :controller do
   end
 end
 
-describe Spree::Admin::InvoicesController, type: :controller do
+RSpec.describe Spree::Admin::InvoicesController, type: :controller do
   describe "#index" do
     let(:user) { create(:user) }
     let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) }
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
index a6ed0be235..1e3b1cf8c6 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::PaymentsController, type: :controller do
+RSpec.describe Spree::Admin::PaymentsController, type: :controller do
   include StripeHelper
   include StripeStubs
 
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 6478629e48..1917294fac 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::PaymentsController, type: :controller do
+RSpec.describe Spree::Admin::PaymentsController, type: :controller do
   let!(:shop) { create(:enterprise) }
   let!(:user) { shop.owner }
   let!(:order) { create(:order, distributor: shop, state: 'complete') }
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 0dc568430d..d4dab4e0b2 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::OrdersController, type: :controller do
+RSpec.describe Spree::Admin::OrdersController, type: :controller do
   describe "#edit" do
     let!(:order) { create(:order_with_totals_and_distribution, ship_address: create(:address)) }
 
diff --git a/spec/controllers/spree/admin/overview_controller_spec.rb b/spec/controllers/spree/admin/overview_controller_spec.rb
index 455f3b3ac9..cb5f218f24 100644
--- a/spec/controllers/spree/admin/overview_controller_spec.rb
+++ b/spec/controllers/spree/admin/overview_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::OverviewController, type: :controller do
+RSpec.describe Spree::Admin::OverviewController, type: :controller do
   describe "#index" do
     before do
       allow(controller).to receive(:spree_current_user).and_return(user)
diff --git a/spec/controllers/spree/admin/payment_methods_controller_spec.rb b/spec/controllers/spree/admin/payment_methods_controller_spec.rb
index 37569b28ec..e6d3288603 100644
--- a/spec/controllers/spree/admin/payment_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/payment_methods_controller_spec.rb
@@ -7,7 +7,7 @@ module Spree
     preference :password, :string, default: "password"
   end
 
-  describe Admin::PaymentMethodsController, type: :controller do
+  RSpec.describe Admin::PaymentMethodsController, type: :controller do
     let(:user) {
       create(:user, enterprises: [create(:distributor_enterprise)])
     }
diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb
index 9dbf146f53..2e33fc3926 100644
--- a/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spec/controllers/spree/admin/products_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::ProductsController, type: :controller do
+RSpec.describe Spree::Admin::ProductsController, type: :controller do
   describe 'bulk_update' do
     context "updating a product we do not have access to" do
       let(:s_managed) { create(:enterprise) }
diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
index d8b0a1ca42..d76ee014bd 100644
--- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
+++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe ReturnAuthorizationsController, type: :controller do
+    RSpec.describe ReturnAuthorizationsController, type: :controller do
       include AuthenticationHelper
 
       let(:order) { create(:shipped_order, distributor: create(:distributor_enterprise)) }
diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb
index 53313e5521..a62e38e6b9 100644
--- a/spec/controllers/spree/admin/search_controller_spec.rb
+++ b/spec/controllers/spree/admin/search_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::SearchController, type: :controller do
+RSpec.describe Spree::Admin::SearchController, type: :controller do
   context "Distributor Enterprise User" do
     let!(:owner) { create(:user, email: "test1@email.com" ) }
     let!(:manager) { create(:user, email: "test2@email.com" ) }
diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
index 8a77bb78c6..e7df05f5f4 100644
--- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe ShippingCategoriesController, type: :controller do
+    RSpec.describe ShippingCategoriesController, type: :controller do
       include AuthenticationHelper
 
       describe "#create and #update" do
diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
index e93103e2d6..efdb46d78c 100644
--- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::ShippingMethodsController, type: :controller do
+RSpec.describe Spree::Admin::ShippingMethodsController, type: :controller do
   include AuthenticationHelper
 
   describe "#update" do
diff --git a/spec/controllers/spree/admin/tax_rates_controller_spec.rb b/spec/controllers/spree/admin/tax_rates_controller_spec.rb
index 3ce91d9ebf..ad9bc2cb72 100644
--- a/spec/controllers/spree/admin/tax_rates_controller_spec.rb
+++ b/spec/controllers/spree/admin/tax_rates_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe TaxRatesController, type: :controller do
+    RSpec.describe TaxRatesController, type: :controller do
       include AuthenticationHelper
 
       let!(:default_tax_zone) { create(:zone, default_tax: true) }
diff --git a/spec/controllers/spree/admin/tax_settings_controller_spec.rb b/spec/controllers/spree/admin/tax_settings_controller_spec.rb
index dbb320b1c6..e41d1825a4 100644
--- a/spec/controllers/spree/admin/tax_settings_controller_spec.rb
+++ b/spec/controllers/spree/admin/tax_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::TaxSettingsController, type: :controller do
+RSpec.describe Spree::Admin::TaxSettingsController, type: :controller do
   describe "#update" do
     let(:params) { { preferences: { products_require_tax_category: "1" } } }
 
diff --git a/spec/controllers/spree/admin/taxons_controller_spec.rb b/spec/controllers/spree/admin/taxons_controller_spec.rb
index 8c19f14da8..3abc6669aa 100644
--- a/spec/controllers/spree/admin/taxons_controller_spec.rb
+++ b/spec/controllers/spree/admin/taxons_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::TaxonsController do
+RSpec.describe Spree::Admin::TaxonsController do
   render_views
 
   let(:taxonomy) { create(:taxonomy) }
diff --git a/spec/controllers/spree/admin/users_controller_spec.rb b/spec/controllers/spree/admin/users_controller_spec.rb
index 96e7cc4df4..11d4b969c4 100644
--- a/spec/controllers/spree/admin/users_controller_spec.rb
+++ b/spec/controllers/spree/admin/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::UsersController do
+RSpec.describe Spree::Admin::UsersController do
   context '#authorize_admin' do
     let(:user) { create(:user) }
     let(:test_user) { create(:user) }
diff --git a/spec/controllers/spree/admin/variants_controller_spec.rb b/spec/controllers/spree/admin/variants_controller_spec.rb
index 7bdfc7bcbe..8585415d0e 100644
--- a/spec/controllers/spree/admin/variants_controller_spec.rb
+++ b/spec/controllers/spree/admin/variants_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe VariantsController, type: :controller do
+    RSpec.describe VariantsController, type: :controller do
       before { controller_login_as_admin }
 
       describe "#index" do
diff --git a/spec/controllers/spree/api_keys_controller_spec.rb b/spec/controllers/spree/api_keys_controller_spec.rb
index 99faf43964..5b3162acc0 100644
--- a/spec/controllers/spree/api_keys_controller_spec.rb
+++ b/spec/controllers/spree/api_keys_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::ApiKeysController, type: :controller, performance: true do
+RSpec.describe Spree::ApiKeysController, type: :controller, performance: true do
   routes { Spree::Core::Engine.routes }
 
   include AuthenticationHelper
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index 41e87d975c..c5163163ed 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::CreditCardsController, type: :controller do
+RSpec.describe Spree::CreditCardsController, type: :controller do
   describe "using VCR", :vcr, :stripe_version do
     let(:user) { create(:user) }
 
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 78ed96e16e..f1f47762c2 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::OrdersController, type: :controller do
+RSpec.describe Spree::OrdersController, type: :controller do
   include CheckoutHelper
   include StripeStubs
 
diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb
index 34053783b7..5f03575263 100644
--- a/spec/controllers/spree/user_sessions_controller_spec.rb
+++ b/spec/controllers/spree/user_sessions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::UserSessionsController, type: :controller do
+RSpec.describe Spree::UserSessionsController, type: :controller do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb
index ee8de1d00f..6eff295eb6 100644
--- a/spec/controllers/spree/users_controller_spec.rb
+++ b/spec/controllers/spree/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::UsersController, type: :controller do
+RSpec.describe Spree::UsersController, type: :controller do
   routes { Spree::Core::Engine.routes }
 
   include AuthenticationHelper
diff --git a/spec/controllers/stripe/callbacks_controller_spec.rb b/spec/controllers/stripe/callbacks_controller_spec.rb
index de37d51cc8..b4a122620f 100644
--- a/spec/controllers/stripe/callbacks_controller_spec.rb
+++ b/spec/controllers/stripe/callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Stripe::CallbacksController, type: :controller do
+RSpec.describe Stripe::CallbacksController, type: :controller do
   let(:enterprise) { create(:distributor_enterprise) }
 
   context "#index" do
diff --git a/spec/controllers/stripe/webhooks_controller_spec.rb b/spec/controllers/stripe/webhooks_controller_spec.rb
index 1369a6aa47..38ccaff797 100644
--- a/spec/controllers/stripe/webhooks_controller_spec.rb
+++ b/spec/controllers/stripe/webhooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Stripe::WebhooksController, type: :controller do
+RSpec.describe Stripe::WebhooksController, type: :controller do
   describe "#create" do
     let(:params) do
       {
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index dd4897c4e1..d276d4c874 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserConfirmationsController, type: :controller do
+RSpec.describe UserConfirmationsController, type: :controller do
   let!(:user) { create(:user) }
   let!(:confirmed_user) { create(:user, confirmed_at: nil) }
   let!(:unconfirmed_user) { create(:user, confirmed_at: nil) }
diff --git a/spec/controllers/user_passwords_controller_spec.rb b/spec/controllers/user_passwords_controller_spec.rb
index 7ba17274b8..594f5dbd79 100644
--- a/spec/controllers/user_passwords_controller_spec.rb
+++ b/spec/controllers/user_passwords_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserPasswordsController, type: :controller do
+RSpec.describe UserPasswordsController, type: :controller do
   render_views
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb
index d25b811d69..23aa1e220a 100644
--- a/spec/controllers/user_registrations_controller_spec.rb
+++ b/spec/controllers/user_registrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserRegistrationsController, type: :controller do
+RSpec.describe UserRegistrationsController, type: :controller do
   before do
     @request.env["devise.mapping"] = Devise.mappings[:spree_user]
   end
diff --git a/spec/controllers/webhook_endpoints_controller_spec.rb b/spec/controllers/webhook_endpoints_controller_spec.rb
index e628710f72..bd6ea07961 100644
--- a/spec/controllers/webhook_endpoints_controller_spec.rb
+++ b/spec/controllers/webhook_endpoints_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
-describe WebhookEndpointsController, type: :controller do
+RSpec.describe WebhookEndpointsController, type: :controller do
   let(:user) { create(:admin_user) }
 
   before { allow(controller).to receive(:spree_current_user) { user } }
diff --git a/spec/forms/enterprise_fees_bulk_update_spec.rb b/spec/forms/enterprise_fees_bulk_update_spec.rb
index 1ec22a8c8e..2fcd1a854f 100644
--- a/spec/forms/enterprise_fees_bulk_update_spec.rb
+++ b/spec/forms/enterprise_fees_bulk_update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseFeesBulkUpdate do
+RSpec.describe EnterpriseFeesBulkUpdate do
   describe "error reporting" do
     let(:enterprise_fee) { build_stubbed(:enterprise_fee) }
     let(:base_attributes) do
diff --git a/spec/helpers/admin/enterprises_helper_spec.rb b/spec/helpers/admin/enterprises_helper_spec.rb
index e7683a12b3..58131fdf06 100644
--- a/spec/helpers/admin/enterprises_helper_spec.rb
+++ b/spec/helpers/admin/enterprises_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Admin::EnterprisesHelper, type: :helper do
+RSpec.describe Admin::EnterprisesHelper, type: :helper do
   let(:user) { build(:user) }
 
   before do
diff --git a/spec/helpers/admin/orders_helper_spec.rb b/spec/helpers/admin/orders_helper_spec.rb
index ff00b73dc7..9199c7794e 100644
--- a/spec/helpers/admin/orders_helper_spec.rb
+++ b/spec/helpers/admin/orders_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Admin::OrdersHelper, type: :helper do
+RSpec.describe Admin::OrdersHelper, type: :helper do
   describe "#order_adjustments_for_display" do
     let(:order) { create(:order) }
     let(:service) { instance_double(VoucherAdjustmentsService, voucher_included_tax:) }
diff --git a/spec/helpers/admin/reports_helper_spec.rb b/spec/helpers/admin/reports_helper_spec.rb
index 9ea424bc48..0cd63d9037 100644
--- a/spec/helpers/admin/reports_helper_spec.rb
+++ b/spec/helpers/admin/reports_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReportsHelper, type: :helper do
+RSpec.describe ReportsHelper, type: :helper do
   describe "#report_payment_method_options" do
     let(:order_with_payments) { create(:order_ready_to_ship) }
     let(:order_without_payments) { create(:order_with_line_items) }
diff --git a/spec/helpers/admin/subscriptions_helper_spec.rb b/spec/helpers/admin/subscriptions_helper_spec.rb
index dec9c2d6af..f4dc888ab3 100644
--- a/spec/helpers/admin/subscriptions_helper_spec.rb
+++ b/spec/helpers/admin/subscriptions_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SubscriptionsHelper, type: :helper do
+RSpec.describe Admin::SubscriptionsHelper, type: :helper do
   describe "checking if setup is complete for any [shop]" do
     let(:shop) { create(:distributor_enterprise) }
     let(:customer) { create(:customer, enterprise: shop) }
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index c13cdf44f0..c9aa5c7b0d 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationHelper, type: :helper do
+RSpec.describe ApplicationHelper, type: :helper do
   describe "#feature?" do
     it "takes several actors" do
       user = Spree::User.new(id: 4)
diff --git a/spec/helpers/bulk_form_builder_spec.rb b/spec/helpers/bulk_form_builder_spec.rb
index 2c1bbc23c7..6400d8b221 100644
--- a/spec/helpers/bulk_form_builder_spec.rb
+++ b/spec/helpers/bulk_form_builder_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 class TestHelper < ActionView::Base; end
 
-describe BulkFormBuilder do
+RSpec.describe BulkFormBuilder do
   describe '#text_field' do
     let(:product) { create(:product) }
     let(:form) { BulkFormBuilder.new(:product, product, self, {}) }
diff --git a/spec/helpers/checkout_helper_spec.rb b/spec/helpers/checkout_helper_spec.rb
index 9aae5df87a..a6f8350a24 100644
--- a/spec/helpers/checkout_helper_spec.rb
+++ b/spec/helpers/checkout_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CheckoutHelper, type: :helper do
+RSpec.describe CheckoutHelper, type: :helper do
   it "generates html for validated inputs" do
     expect(helper).to receive(:render).with(
       "shared/validated_input",
diff --git a/spec/helpers/i18n_helper_spec.rb b/spec/helpers/i18n_helper_spec.rb
index a4117097d4..d8434d228c 100644
--- a/spec/helpers/i18n_helper_spec.rb
+++ b/spec/helpers/i18n_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe I18nHelper, type: :helper do
+RSpec.describe I18nHelper, type: :helper do
   let(:user) { create(:user) }
   let(:cookies) { {} }
 
diff --git a/spec/helpers/injection_helper_spec.rb b/spec/helpers/injection_helper_spec.rb
index 1c355a5577..d7cc660951 100644
--- a/spec/helpers/injection_helper_spec.rb
+++ b/spec/helpers/injection_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InjectionHelper, type: :helper do
+RSpec.describe InjectionHelper, type: :helper do
   let!(:enterprise) { create(:distributor_enterprise, facebook: "roger") }
 
   let!(:distributor1) { create(:distributor_enterprise) }
diff --git a/spec/helpers/link_helper_spec.rb b/spec/helpers/link_helper_spec.rb
index 6632df9928..cf7c6a07c5 100644
--- a/spec/helpers/link_helper_spec.rb
+++ b/spec/helpers/link_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LinkHelper, type: :helper do
+RSpec.describe LinkHelper, type: :helper do
   describe "ext_url" do
     it "adds prefix if missing" do
       expect(helper.ext_url("http://example.com/", "http://example.com/bla")).to eq("http://example.com/bla")
diff --git a/spec/helpers/navigation_helper_spec.rb b/spec/helpers/navigation_helper_spec.rb
index ee01b3204a..e5a9a40c00 100644
--- a/spec/helpers/navigation_helper_spec.rb
+++ b/spec/helpers/navigation_helper_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe NavigationHelper, type: :helper do
+    RSpec.describe NavigationHelper, type: :helper do
       describe "klass_for" do
         it "returns the class when present" do
           expect(helper.klass_for('products')).to eq(Spree::Product)
diff --git a/spec/helpers/order_cycles_helper_spec.rb b/spec/helpers/order_cycles_helper_spec.rb
index 443556be84..cb7a7d1151 100644
--- a/spec/helpers/order_cycles_helper_spec.rb
+++ b/spec/helpers/order_cycles_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCyclesHelper, type: :helper do
+RSpec.describe OrderCyclesHelper, type: :helper do
   let(:oc) { double(:order_cycle) }
 
   describe "finding producer enterprise options" do
diff --git a/spec/helpers/serializer_helper_spec.rb b/spec/helpers/serializer_helper_spec.rb
index 6ba9589abe..911515a7c3 100644
--- a/spec/helpers/serializer_helper_spec.rb
+++ b/spec/helpers/serializer_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SerializerHelper, type: :helper do
+RSpec.describe SerializerHelper, type: :helper do
   let(:serializer) do
     Class.new(ActiveModel::Serializer) do
       attributes :id, :name
diff --git a/spec/helpers/shop_helper_spec.rb b/spec/helpers/shop_helper_spec.rb
index 1c0bd4df7b..e59881d6ef 100644
--- a/spec/helpers/shop_helper_spec.rb
+++ b/spec/helpers/shop_helper_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 require 'spec_helper'
-describe ShopHelper, type: :helper do
+RSpec.describe ShopHelper, type: :helper do
   describe "shop_tabs" do
     context "distributor with groups" do
       let(:group) { create(:enterprise_group) }
diff --git a/spec/helpers/spree/admin/base_helper_spec.rb b/spec/helpers/spree/admin/base_helper_spec.rb
index 8930d83d5a..958f7f2ae1 100644
--- a/spec/helpers/spree/admin/base_helper_spec.rb
+++ b/spec/helpers/spree/admin/base_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::BaseHelper, type: :helper do
+RSpec.describe Spree::Admin::BaseHelper, type: :helper do
   helper 'spree/admin/navigation'
 
   describe "#link_to_remove_fields" do
diff --git a/spec/helpers/spree/admin/general_settings_helper_spec.rb b/spec/helpers/spree/admin/general_settings_helper_spec.rb
index b63d7c8cdc..c5713c6dec 100644
--- a/spec/helpers/spree/admin/general_settings_helper_spec.rb
+++ b/spec/helpers/spree/admin/general_settings_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::GeneralSettingsHelper, type: :helper do
+RSpec.describe Spree::Admin::GeneralSettingsHelper, type: :helper do
   describe "#all_units" do
     it "returns all units" do
       expect(helper.all_units).to eq(["mg", "g", "kg", "T", "oz", "lb", "mL", "cL", "dL", "L",
diff --git a/spec/helpers/spree/admin/orders_helper_spec.rb b/spec/helpers/spree/admin/orders_helper_spec.rb
index 07b5a10f7c..b759df39c9 100644
--- a/spec/helpers/spree/admin/orders_helper_spec.rb
+++ b/spec/helpers/spree/admin/orders_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Admin::OrdersHelper, type: :helper do
+RSpec.describe Spree::Admin::OrdersHelper, type: :helper do
   describe "#orders_links" do
     let(:order) { double(:order) }
     let(:distributor) { double(:enterprise) }
diff --git a/spec/helpers/spree/base_helper_spec.rb b/spec/helpers/spree/base_helper_spec.rb
index 54d965f1cf..35511de2be 100644
--- a/spec/helpers/spree/base_helper_spec.rb
+++ b/spec/helpers/spree/base_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::BaseHelper do
+RSpec.describe Spree::BaseHelper do
   include Spree::BaseHelper
 
   context "available_countries" do
diff --git a/spec/helpers/spree/orders_helper_spec.rb b/spec/helpers/spree/orders_helper_spec.rb
index a44bd9afab..a74ce38e9e 100644
--- a/spec/helpers/spree/orders_helper_spec.rb
+++ b/spec/helpers/spree/orders_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::OrdersHelper, type: :helper do
+RSpec.describe Spree::OrdersHelper, type: :helper do
   describe "#changeable_orders" do
     let(:complete_orders) { double(:complete_orders, where: "some_orders") }
 
diff --git a/spec/helpers/tax_helper_spec.rb b/spec/helpers/tax_helper_spec.rb
index ed87864390..2d262d8486 100644
--- a/spec/helpers/tax_helper_spec.rb
+++ b/spec/helpers/tax_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TaxHelper, type: :helper do
+RSpec.describe TaxHelper, type: :helper do
   let(:line_item) { create(:line_item) }
   let(:line_item2) { create(:line_item) }
   let(:line_item3) { create(:line_item) }
diff --git a/spec/helpers/terms_and_conditions_helper_spec.rb b/spec/helpers/terms_and_conditions_helper_spec.rb
index 320426ea51..100fc3e80d 100644
--- a/spec/helpers/terms_and_conditions_helper_spec.rb
+++ b/spec/helpers/terms_and_conditions_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TermsAndConditionsHelper, type: :helper do
+RSpec.describe TermsAndConditionsHelper, type: :helper do
   describe "#platform_terms_required?" do
     context 'when ToS file is present' do
       before do
diff --git a/spec/jobs/bulk_invoice_job_spec.rb b/spec/jobs/bulk_invoice_job_spec.rb
index 907749033c..3d8e137093 100644
--- a/spec/jobs/bulk_invoice_job_spec.rb
+++ b/spec/jobs/bulk_invoice_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BulkInvoiceJob do
+RSpec.describe BulkInvoiceJob do
   subject { BulkInvoiceJob.new(order_ids, "/tmp/file/path") }
 
   context "when invoices are enabled", feature: :invoices do
diff --git a/spec/jobs/heartbeat_job_spec.rb b/spec/jobs/heartbeat_job_spec.rb
index d60aa23b31..933e9cd456 100644
--- a/spec/jobs/heartbeat_job_spec.rb
+++ b/spec/jobs/heartbeat_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HeartbeatJob do
+RSpec.describe HeartbeatJob do
   context "with time frozen" do
     let(:run_time) { Time.zone.local(2016, 4, 13, 13, 0, 0) }
 
diff --git a/spec/jobs/job_logger_spec.rb b/spec/jobs/job_logger_spec.rb
index de7a12c946..7d93868ef5 100644
--- a/spec/jobs/job_logger_spec.rb
+++ b/spec/jobs/job_logger_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe JobLogger do
+RSpec.describe JobLogger do
   describe '.logger' do
     it "returns a Ruby's logger instance" do
       expect(JobLogger.logger).to respond_to(:info)
diff --git a/spec/jobs/order_cycle_closing_job_spec.rb b/spec/jobs/order_cycle_closing_job_spec.rb
index 33be226c24..dc1f7ce23d 100644
--- a/spec/jobs/order_cycle_closing_job_spec.rb
+++ b/spec/jobs/order_cycle_closing_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycleClosingJob do
+RSpec.describe OrderCycleClosingJob do
   let(:order_cycle1) {
     create(:order_cycle, automatic_notifications: true, orders_close_at: 1.minute.ago)
   }
diff --git a/spec/jobs/order_cycle_notification_job_spec.rb b/spec/jobs/order_cycle_notification_job_spec.rb
index 233beac26b..f8496fc86c 100644
--- a/spec/jobs/order_cycle_notification_job_spec.rb
+++ b/spec/jobs/order_cycle_notification_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycleNotificationJob do
+RSpec.describe OrderCycleNotificationJob do
   let(:order_cycle) { create(:order_cycle) }
   let(:mail) { double(:mail, deliver_now: true) }
 
diff --git a/spec/jobs/order_cycle_opened_job_spec.rb b/spec/jobs/order_cycle_opened_job_spec.rb
index b0ebfbe927..caf5ee6ef1 100644
--- a/spec/jobs/order_cycle_opened_job_spec.rb
+++ b/spec/jobs/order_cycle_opened_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycleOpenedJob do
+RSpec.describe OrderCycleOpenedJob do
   let(:oc_opened_before) {
     create(:order_cycle, orders_open_at: 1.hour.ago)
   }
diff --git a/spec/jobs/report_job_spec.rb b/spec/jobs/report_job_spec.rb
index 399cbcbbb6..e1ce4a1a56 100644
--- a/spec/jobs/report_job_spec.rb
+++ b/spec/jobs/report_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReportJob do
+RSpec.describe ReportJob do
   include CableReady::Broadcaster
 
   let(:report_args) {
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index d5cf92c40c..bdad78a5a9 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SubscriptionConfirmJob do
+RSpec.describe SubscriptionConfirmJob do
   let(:job) { SubscriptionConfirmJob.new }
 
   describe "finding proxy_orders that are ready to be confirmed" do
diff --git a/spec/jobs/subscription_placement_job_spec.rb b/spec/jobs/subscription_placement_job_spec.rb
index c6bb6c232b..26c7093c31 100644
--- a/spec/jobs/subscription_placement_job_spec.rb
+++ b/spec/jobs/subscription_placement_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SubscriptionPlacementJob do
+RSpec.describe SubscriptionPlacementJob do
   include ActiveSupport::Testing::TimeHelpers
 
   let(:job) { SubscriptionPlacementJob.new }
diff --git a/spec/jobs/webhook_delivery_job_spec.rb b/spec/jobs/webhook_delivery_job_spec.rb
index 14c7367d3a..0b09ed7bde 100644
--- a/spec/jobs/webhook_delivery_job_spec.rb
+++ b/spec/jobs/webhook_delivery_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe WebhookDeliveryJob do
+RSpec.describe WebhookDeliveryJob do
   subject { WebhookDeliveryJob.new(url, event, data) }
   let(:url) { 'https://test/endpoint' }
   let(:event) { 'order_cycle.opened' }
diff --git a/spec/lib/action_dispatch/request_spec.rb b/spec/lib/action_dispatch/request_spec.rb
index 59caf701cb..8ab68abc4c 100644
--- a/spec/lib/action_dispatch/request_spec.rb
+++ b/spec/lib/action_dispatch/request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ActionDispatch::Request do
+RSpec.describe ActionDispatch::Request do
   it "strips nils from arrays" do
     expect(parse_query_parameters('key[]=value&key[]')).to eq({ "key" => ["value"] })
   end
diff --git a/spec/lib/haml_up_spec.rb b/spec/lib/haml_up_spec.rb
index 0df7c56642..f78b95017a 100644
--- a/spec/lib/haml_up_spec.rb
+++ b/spec/lib/haml_up_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'haml_up'
 
-describe HamlUp, skip: !Gem::Dependency.new("", "~> 5.2").match?("", Haml::VERSION) do
+RSpec.describe HamlUp, skip: !Gem::Dependency.new("", "~> 5.2").match?("", Haml::VERSION) do
   describe "#rewrite_template" do
     it "preserves a simple template" do
       original = "%p This is a paragraph"
diff --git a/spec/lib/i18n_digests_spec.rb b/spec/lib/i18n_digests_spec.rb
index 391cbb0050..6dd321c98b 100644
--- a/spec/lib/i18n_digests_spec.rb
+++ b/spec/lib/i18n_digests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe I18nDigests do
+RSpec.describe I18nDigests do
   describe "#build_digests" do
     let(:available_locales) { ["en", "es"] }
     let(:md5_hex_regex) { /([a-f0-9]){10}/ }
diff --git a/spec/lib/open_food_network/address_finder_spec.rb b/spec/lib/open_food_network/address_finder_spec.rb
index 1f11b57b41..499f7dff86 100644
--- a/spec/lib/open_food_network/address_finder_spec.rb
+++ b/spec/lib/open_food_network/address_finder_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/address_finder'
 
 module OpenFoodNetwork
-  describe AddressFinder do
+  RSpec.describe AddressFinder do
     let(:email) { 'test@example.com' }
 
     describe "initialisation" do
diff --git a/spec/lib/open_food_network/enterprise_fee_applicator_spec.rb b/spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
index 94c0b46b17..98f7db2325 100644
--- a/spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
+++ b/spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/enterprise_fee_applicator'
 
 module OpenFoodNetwork
-  describe EnterpriseFeeApplicator do
+  RSpec.describe EnterpriseFeeApplicator do
     let(:line_item) { create(:line_item, variant: target_variant) }
     let(:inherits_tax) { true }
     let(:enterprise_fee) {
diff --git a/spec/lib/open_food_network/enterprise_fee_calculator_spec.rb b/spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
index 78f23deb72..29f96c231a 100644
--- a/spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
+++ b/spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/enterprise_fee_calculator'
 
 module OpenFoodNetwork
-  describe EnterpriseFeeCalculator do
+  RSpec.describe EnterpriseFeeCalculator do
     describe "integration" do
       let(:supplier1)    { create(:supplier_enterprise) }
       let(:supplier2)    { create(:supplier_enterprise) }
diff --git a/spec/lib/open_food_network/enterprise_issue_validator_spec.rb b/spec/lib/open_food_network/enterprise_issue_validator_spec.rb
index 8630dfcd36..879282cf9d 100644
--- a/spec/lib/open_food_network/enterprise_issue_validator_spec.rb
+++ b/spec/lib/open_food_network/enterprise_issue_validator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/enterprise_issue_validator'
 
 module OpenFoodNetwork
-  describe EnterpriseIssueValidator do
+  RSpec.describe EnterpriseIssueValidator do
     describe "warnings" do
       let(:enterprise_invisible) { create(:enterprise, visible: "only_through_links") }
       let(:warnings) { EnterpriseIssueValidator.new(enterprise_invisible).warnings }
diff --git a/spec/lib/open_food_network/error_logger_spec.rb b/spec/lib/open_food_network/error_logger_spec.rb
index 88afdeede2..a2335ee1d9 100644
--- a/spec/lib/open_food_network/error_logger_spec.rb
+++ b/spec/lib/open_food_network/error_logger_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/error_logger'
 
 module OpenFoodNetwork
-  describe ErrorLogger do
+  RSpec.describe ErrorLogger do
     let(:error) { StandardError.new("Test") }
 
     it "notifies Bugsnag" do
diff --git a/spec/lib/open_food_network/feature_toggle_spec.rb b/spec/lib/open_food_network/feature_toggle_spec.rb
index 9c9861257a..9d185a8fc6 100644
--- a/spec/lib/open_food_network/feature_toggle_spec.rb
+++ b/spec/lib/open_food_network/feature_toggle_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OpenFoodNetwork::FeatureToggle do
+RSpec.describe OpenFoodNetwork::FeatureToggle do
   subject(:feature_toggle) { OpenFoodNetwork::FeatureToggle }
 
   describe ".enabled?" do
diff --git a/spec/lib/open_food_network/i18n_config_spec.rb b/spec/lib/open_food_network/i18n_config_spec.rb
index b69aa8b745..210be7e612 100644
--- a/spec/lib/open_food_network/i18n_config_spec.rb
+++ b/spec/lib/open_food_network/i18n_config_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/i18n_config'
 
 module OpenFoodNetwork
-  describe I18nConfig do
+  RSpec.describe I18nConfig do
     before do
       # Allow non-stubbed calls to ENV to proceed
       allow(ENV).to receive(:[]).and_call_original
diff --git a/spec/lib/open_food_network/i18n_inflections_spec.rb b/spec/lib/open_food_network/i18n_inflections_spec.rb
index 2d8bc25d22..70af2719d2 100644
--- a/spec/lib/open_food_network/i18n_inflections_spec.rb
+++ b/spec/lib/open_food_network/i18n_inflections_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/i18n_inflections'
 
-describe OpenFoodNetwork::I18nInflections do
+RSpec.describe OpenFoodNetwork::I18nInflections do
   let(:subject) { described_class }
 
   it "returns the same word if no plural is known" do
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index 96314aa674..e12cd9c6a9 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -5,7 +5,7 @@ require "spec_helper"
 require 'open_food_network/order_cycle_form_applicator'
 
 module OpenFoodNetwork
-  describe OrderCycleFormApplicator do
+  RSpec.describe OrderCycleFormApplicator do
     let!(:user) { create(:user) }
 
     context "unit specs" do
diff --git a/spec/lib/open_food_network/order_cycle_permissions_spec.rb b/spec/lib/open_food_network/order_cycle_permissions_spec.rb
index d7d3f93c40..72a9ada9e5 100644
--- a/spec/lib/open_food_network/order_cycle_permissions_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_permissions_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
 module OpenFoodNetwork
-  describe OrderCyclePermissions do
+  RSpec.describe OrderCyclePermissions do
     let(:coordinator) { create(:distributor_enterprise) }
     let(:hub) { create(:distributor_enterprise) }
     let(:producer) { create(:supplier_enterprise) }
diff --git a/spec/lib/open_food_network/permissions_spec.rb b/spec/lib/open_food_network/permissions_spec.rb
index 0f216a90d1..457b1fd98f 100644
--- a/spec/lib/open_food_network/permissions_spec.rb
+++ b/spec/lib/open_food_network/permissions_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/permissions'
 
 module OpenFoodNetwork
-  describe Permissions do
+  RSpec.describe Permissions do
     let(:user) { double(:user) }
     let(:permissions) { Permissions.new(user) }
     let(:permission) { 'one' }
diff --git a/spec/lib/open_food_network/property_merge_spec.rb b/spec/lib/open_food_network/property_merge_spec.rb
index 6ab1dbd55d..1fd6ef8a74 100644
--- a/spec/lib/open_food_network/property_merge_spec.rb
+++ b/spec/lib/open_food_network/property_merge_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module OpenFoodNetwork
-  describe PropertyMerge do
+  RSpec.describe PropertyMerge do
     let(:property) { create(:property, presentation: 'One') }
     let(:duplicate_property) { create(:property, presentation: 'One') }
     let(:different_property) { create(:property, presentation: 'Two') }
diff --git a/spec/lib/open_food_network/referer_parser_spec.rb b/spec/lib/open_food_network/referer_parser_spec.rb
index b3a0ceaed3..98dd0f4deb 100644
--- a/spec/lib/open_food_network/referer_parser_spec.rb
+++ b/spec/lib/open_food_network/referer_parser_spec.rb
@@ -4,7 +4,7 @@ require 'open_food_network/referer_parser'
 require 'spec_helper'
 
 module OpenFoodNetwork
-  describe RefererParser do
+  RSpec.describe RefererParser do
     it "handles requests without referer" do
       expect(RefererParser.path(nil)).to be_nil
     end
diff --git a/spec/lib/open_food_network/scope_variant_to_hub_spec.rb b/spec/lib/open_food_network/scope_variant_to_hub_spec.rb
index d10d372902..cbff22dc35 100644
--- a/spec/lib/open_food_network/scope_variant_to_hub_spec.rb
+++ b/spec/lib/open_food_network/scope_variant_to_hub_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'open_food_network/scope_variant_to_hub'
 
 module OpenFoodNetwork
-  describe ScopeVariantToHub do
+  RSpec.describe ScopeVariantToHub do
     let(:hub) { create(:distributor_enterprise) }
     let(:v)   { create(:variant, price: 11.11, on_hand: 1, on_demand: true, sku: "VARIANTSKU") }
     let(:v2)  { create(:variant, price: 22.22, on_hand: 5) }
diff --git a/spec/lib/open_food_network/scope_variants_to_search_spec.rb b/spec/lib/open_food_network/scope_variants_to_search_spec.rb
index e896fa8f60..c8f6104ae5 100644
--- a/spec/lib/open_food_network/scope_variants_to_search_spec.rb
+++ b/spec/lib/open_food_network/scope_variants_to_search_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/scope_variants_for_search'
 
-describe OpenFoodNetwork::ScopeVariantsForSearch do
+RSpec.describe OpenFoodNetwork::ScopeVariantsForSearch do
   let!(:p1) { create(:simple_product, name: 'Product 1') }
   let!(:p2) { create(:simple_product, sku: 'Product 1a') }
   let!(:p3) { create(:simple_product, name: 'Product 3') }
diff --git a/spec/lib/open_food_network/tag_rule_applicator_spec.rb b/spec/lib/open_food_network/tag_rule_applicator_spec.rb
index 9aa14c8ccc..bc4195deea 100644
--- a/spec/lib/open_food_network/tag_rule_applicator_spec.rb
+++ b/spec/lib/open_food_network/tag_rule_applicator_spec.rb
@@ -4,7 +4,7 @@ require 'open_food_network/tag_rule_applicator'
 require 'spec_helper'
 
 module OpenFoodNetwork
-  describe TagRuleApplicator do
+  RSpec.describe TagRuleApplicator do
     let!(:enterprise) { create(:distributor_enterprise) }
     let!(:oc_tag_rule) {
       create(:filter_order_cycles_tag_rule, enterprise:, priority: 6,
diff --git a/spec/lib/reports/bulk_coop_report_spec.rb b/spec/lib/reports/bulk_coop_report_spec.rb
index d94e1429c1..775350d18d 100644
--- a/spec/lib/reports/bulk_coop_report_spec.rb
+++ b/spec/lib/reports/bulk_coop_report_spec.rb
@@ -6,7 +6,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module BulkCoop
-      describe Base do
+      RSpec.describe Base do
         subject { Base.new user, params }
         let(:user) { create(:admin_user) }
 
diff --git a/spec/lib/reports/customers_report_spec.rb b/spec/lib/reports/customers_report_spec.rb
index 7e0a4fac0d..bdd18d57b6 100644
--- a/spec/lib/reports/customers_report_spec.rb
+++ b/spec/lib/reports/customers_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module Customers
-      describe Base do
+      RSpec.describe Base do
         context "as a site admin" do
           let(:user) do
             user = create(:user)
diff --git a/spec/lib/reports/enterprise_fee_summary/authorizer_spec.rb b/spec/lib/reports/enterprise_fee_summary/authorizer_spec.rb
index 9409ad5f04..40b64ab74a 100644
--- a/spec/lib/reports/enterprise_fee_summary/authorizer_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/authorizer_spec.rb
@@ -5,7 +5,7 @@ require "spec_helper"
 module Reporting
   module Reports
     module EnterpriseFeeSummary
-      describe Authorizer do
+      RSpec.describe Authorizer do
         let(:user) { create(:user) }
 
         let(:parameters) { Parameters.new(params) }
diff --git a/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb b/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb
index 2ddcf23d6c..a11f40a7ac 100644
--- a/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
+RSpec.describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
   let(:report_module) { Reporting::Reports::EnterpriseFeeSummary }
 
   # Basic data.
diff --git a/spec/lib/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer_spec.rb b/spec/lib/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer_spec.rb
index 76bfe69459..a993becede 100644
--- a/spec/lib/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::EnterpriseFeeSummary::EnterpriseFeesWithTaxReportByProducer do
+RSpec.describe Reporting::Reports::EnterpriseFeeSummary::EnterpriseFeesWithTaxReportByProducer do
   let(:current_user) { create(:admin_user) }
 
   let(:enterprise) {
diff --git a/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb b/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb
index 25b684d5a0..b803041573 100644
--- a/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/parameters_spec.rb
@@ -5,7 +5,7 @@ require "spec_helper"
 module Reporting
   module Reports
     module EnterpriseFeeSummary
-      describe Parameters do
+      RSpec.describe Parameters do
         describe "validation" do
           let(:parameters) { described_class.new }
 
diff --git a/spec/lib/reports/enterprise_fee_summary/permissions_spec.rb b/spec/lib/reports/enterprise_fee_summary/permissions_spec.rb
index 8de188cbdf..decb37a18e 100644
--- a/spec/lib/reports/enterprise_fee_summary/permissions_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/permissions_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::EnterpriseFeeSummary::Permissions do
+RSpec.describe Reporting::Reports::EnterpriseFeeSummary::Permissions do
   let!(:order_cycle) { create(:simple_order_cycle) }
   let!(:incoming_exchange) { create(:exchange, incoming: true, order_cycle:) }
   let!(:outgoing_exchange) { create(:exchange, incoming: false, order_cycle:) }
diff --git a/spec/lib/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb b/spec/lib/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb
index 5f26970c00..d7e9e9f6b5 100644
--- a/spec/lib/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::EnterpriseFeeSummary::ReportData::EnterpriseFeeTypeTotal do
+RSpec.describe Reporting::Reports::EnterpriseFeeSummary::ReportData::EnterpriseFeeTypeTotal do
   it "sorts instances according to their attributes" do
     instance_a = described_class.new(
       fee_type: "sales",
diff --git a/spec/lib/reports/enterprise_fee_summary/summarizer_spec.rb b/spec/lib/reports/enterprise_fee_summary/summarizer_spec.rb
index 9070089609..e161d84597 100644
--- a/spec/lib/reports/enterprise_fee_summary/summarizer_spec.rb
+++ b/spec/lib/reports/enterprise_fee_summary/summarizer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::EnterpriseFeeSummary::Summarizer do
+RSpec.describe Reporting::Reports::EnterpriseFeeSummary::Summarizer do
   let(:row) {
     {
       "total_amount" => 1, "payment_method_name" => nil,
diff --git a/spec/lib/reports/lettuce_share_report_spec.rb b/spec/lib/reports/lettuce_share_report_spec.rb
index 528b085427..1501ffc778 100644
--- a/spec/lib/reports/lettuce_share_report_spec.rb
+++ b/spec/lib/reports/lettuce_share_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module ProductsAndInventory
-      describe LettuceShare do
+      RSpec.describe LettuceShare do
         let(:user) { create(:user) }
         let(:report) { LettuceShare.new(user) }
         let(:variant) { create(:variant) }
diff --git a/spec/lib/reports/line_items_spec.rb b/spec/lib/reports/line_items_spec.rb
index 8e04eb714f..6619634ac2 100644
--- a/spec/lib/reports/line_items_spec.rb
+++ b/spec/lib/reports/line_items_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Reporting::LineItems do
+RSpec.describe Reporting::LineItems do
   # This object lets us add some test coverage despite the very deep coupling between the class
   # under test and the various objects it depends on. Other more common moking strategies where very
   # hard.
diff --git a/spec/lib/reports/order_cycle_management_report_spec.rb b/spec/lib/reports/order_cycle_management_report_spec.rb
index 80bed21b3c..65c3a2d86b 100644
--- a/spec/lib/reports/order_cycle_management_report_spec.rb
+++ b/spec/lib/reports/order_cycle_management_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module OrderCycleManagement
-      describe Base do
+      RSpec.describe Base do
         context "as a site admin" do
           subject { Base.new(user, params) }
           let(:params) { {} }
diff --git a/spec/lib/reports/orders_and_distributors_report_spec.rb b/spec/lib/reports/orders_and_distributors_report_spec.rb
index 689ea4d791..37fd4de00e 100644
--- a/spec/lib/reports/orders_and_distributors_report_spec.rb
+++ b/spec/lib/reports/orders_and_distributors_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module OrdersAndDistributors
-      describe Base do
+      RSpec.describe Base do
         describe 'orders and distributors report' do
           it 'should return a header row describing the report' do
             subject = Base.new nil
diff --git a/spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb
index c2d6eccbb3..16511bca45 100644
--- a/spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Reporting::Reports::OrdersAndFulfillment::OrderCycleCustomerTotals do
+RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleCustomerTotals do
   let!(:distributor) { create(:distributor_enterprise, name: "Apple Market") }
   let!(:customer) { create(:customer, enterprise: distributor, user:, code: "JHN") }
   let(:user) { create(:user, email: "john@example.net") }
diff --git a/spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb
index f88dab48bd..9bedefa186 100644
--- a/spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module OrdersAndFulfillment
-      describe OrderCycleDistributorTotalsBySupplier do
+      RSpec.describe OrderCycleDistributorTotalsBySupplier do
         let!(:distributor) { create(:distributor_enterprise) }
 
         let!(:order) do
diff --git a/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
index a5ddd3f877..c6cbb733d0 100644
--- a/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module OrdersAndFulfillment
-      describe OrderCycleSupplierTotalsByDistributor do
+      RSpec.describe OrderCycleSupplierTotalsByDistributor do
         let!(:distributor) { create(:distributor_enterprise) }
 
         let!(:order) do
diff --git a/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
index e5206e429a..c40dcc90db 100644
--- a/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotals do
+RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotals do
   let!(:distributor) { create(:distributor_enterprise) }
 
   let!(:order) do
diff --git a/spec/lib/reports/packing/packing_report_spec.rb b/spec/lib/reports/packing/packing_report_spec.rb
index ead8344bcc..624a5dab5a 100644
--- a/spec/lib/reports/packing/packing_report_spec.rb
+++ b/spec/lib/reports/packing/packing_report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Packing Reports" do
+RSpec.describe "Packing Reports" do
   include AuthenticationHelper
 
   describe "fetching orders" do
diff --git a/spec/lib/reports/products_and_inventory_report_spec.rb b/spec/lib/reports/products_and_inventory_report_spec.rb
index 8096fa46b1..79b8c6d21c 100644
--- a/spec/lib/reports/products_and_inventory_report_spec.rb
+++ b/spec/lib/reports/products_and_inventory_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module ProductsAndInventory
-      describe Base do
+      RSpec.describe Base do
         context "As a site admin" do
           let(:user) do
             user = create(:user)
@@ -264,7 +264,7 @@ module Reporting
         end
       end
 
-      describe AllProducts do
+      RSpec.describe AllProducts do
         let(:user) do
           user = create(:user)
           user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin')
diff --git a/spec/lib/reports/report_loader_spec.rb b/spec/lib/reports/report_loader_spec.rb
index 930c5af1ac..af2b877833 100644
--- a/spec/lib/reports/report_loader_spec.rb
+++ b/spec/lib/reports/report_loader_spec.rb
@@ -16,7 +16,7 @@ module Reporting
   end
 end
 
-describe Reporting::ReportLoader do
+RSpec.describe Reporting::ReportLoader do
   let(:service) { Reporting::ReportLoader.new(*arguments) }
   let(:report_base_class) { Reporting::Reports::Bananas::Base }
   let(:report_subtypes) { ["green", "yellow"] }
diff --git a/spec/lib/reports/report_renderer_spec.rb b/spec/lib/reports/report_renderer_spec.rb
index eda37744ca..1671f64c20 100644
--- a/spec/lib/reports/report_renderer_spec.rb
+++ b/spec/lib/reports/report_renderer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Reporting::ReportRenderer do
+RSpec.describe Reporting::ReportRenderer do
   let(:data) {
     [
       { "id" => 1, "name" => "carrots", "quantity" => 3 },
diff --git a/spec/lib/reports/report_spec.rb b/spec/lib/reports/report_spec.rb
index 4d79cc72b6..22a725f99c 100644
--- a/spec/lib/reports/report_spec.rb
+++ b/spec/lib/reports/report_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # rubocop:disable Metrics/ModuleLength
 module Reporting
-  describe ReportTemplate do
+  RSpec.describe ReportTemplate do
     let(:user) { create(:user) }
     let(:params) { {} }
     subject { described_class.new(user, params) }
diff --git a/spec/lib/reports/sales_tax_report_spec.rb b/spec/lib/reports/sales_tax_report_spec.rb
index aa8b6b7885..501ad972e9 100644
--- a/spec/lib/reports/sales_tax_report_spec.rb
+++ b/spec/lib/reports/sales_tax_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module SalesTax
-      describe TaxTypes do
+      RSpec.describe TaxTypes do
         let(:user) { create(:user) }
         let(:report) { TaxTypes.new(user, {}) }
 
diff --git a/spec/lib/reports/sales_tax_totals_by_order_spec.rb b/spec/lib/reports/sales_tax_totals_by_order_spec.rb
index 088d889bb0..641bc8030e 100644
--- a/spec/lib/reports/sales_tax_totals_by_order_spec.rb
+++ b/spec/lib/reports/sales_tax_totals_by_order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Reporting::Reports::SalesTax::SalesTaxTotalsByOrder" do
+RSpec.describe "Reporting::Reports::SalesTax::SalesTaxTotalsByOrder" do
   subject(:report) { Reporting::Reports::SalesTax::SalesTaxTotalsByOrder.new(user, {}) }
 
   let(:user) { create(:user) }
diff --git a/spec/lib/reports/users_and_enterprises_report_spec.rb b/spec/lib/reports/users_and_enterprises_report_spec.rb
index ce0ab369d9..4f1ce54670 100644
--- a/spec/lib/reports/users_and_enterprises_report_spec.rb
+++ b/spec/lib/reports/users_and_enterprises_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module UsersAndEnterprises
-      describe Base do
+      RSpec.describe Base do
         describe "query_result" do
           let!(:owners_and_enterprises) { double(:owners_and_enterprises) }
           let!(:managers_and_enterprises) { double(:managers_and_enterprises) }
diff --git a/spec/lib/reports/xero_invoices_report_spec.rb b/spec/lib/reports/xero_invoices_report_spec.rb
index ab4a0e3b9b..7f64e4b5c1 100644
--- a/spec/lib/reports/xero_invoices_report_spec.rb
+++ b/spec/lib/reports/xero_invoices_report_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Reporting
   module Reports
     module XeroInvoices
-      describe Base do
+      RSpec.describe Base do
         subject { Base.new user, {} }
 
         let(:user) { create(:user) }
diff --git a/spec/lib/spree/core/environment_spec.rb b/spec/lib/spree/core/environment_spec.rb
index 7eec8dc329..114a2f05ca 100644
--- a/spec/lib/spree/core/environment_spec.rb
+++ b/spec/lib/spree/core/environment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Core::Environment do
+RSpec.describe Spree::Core::Environment do
   # Our version doesn't add any features we could test.
   # So we just check that our file is loaded correctly.
   let(:our_file) { Rails.root.join("lib/spree/core/environment.rb").to_s }
diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index cf4569a530..510cc3deea 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # Here we use the OrderMailer as a way to test the mail interceptor.
-describe Spree::OrderMailer do
+RSpec.describe Spree::OrderMailer do
   let(:order) do
     Spree::Order.new(distributor: create(:enterprise),
                      bill_address: create(:address))
diff --git a/spec/lib/spree/core/mail_settings_spec.rb b/spec/lib/spree/core/mail_settings_spec.rb
index 3953c3266f..29b4ef3e63 100644
--- a/spec/lib/spree/core/mail_settings_spec.rb
+++ b/spec/lib/spree/core/mail_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Core::MailSettings do
+RSpec.describe Spree::Core::MailSettings do
   context "overrides appplication defaults" do
     context "authentication method is login" do
       before do
diff --git a/spec/lib/spree/core/product_duplicator_spec.rb b/spec/lib/spree/core/product_duplicator_spec.rb
index 265f2e1d53..e23904ec47 100644
--- a/spec/lib/spree/core/product_duplicator_spec.rb
+++ b/spec/lib/spree/core/product_duplicator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Core::ProductDuplicator do
+RSpec.describe Spree::Core::ProductDuplicator do
   let(:product) do
     double 'Product',
            name: "foo",
diff --git a/spec/lib/spree/core/token_resource_spec.rb b/spec/lib/spree/core/token_resource_spec.rb
index 087c5b9350..1de0d25ea2 100644
--- a/spec/lib/spree/core/token_resource_spec.rb
+++ b/spec/lib/spree/core/token_resource_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 # Its pretty difficult to test this module in isolation b/c it needs to work in conjunction
 #   with an actual class that extends ActiveRecord::Base and has a corresponding table in the DB.
 #   So we'll just test it using Order instead since it included the module.
-describe Spree::Core::TokenResource do
+RSpec.describe Spree::Core::TokenResource do
   let(:order) { Spree::Order.new }
   let(:permission) { double(Spree::TokenizedPermission) }
 
diff --git a/spec/lib/spree/i18n_spec.rb b/spec/lib/spree/i18n_spec.rb
index 04be4e1dc4..bb03786fa4 100644
--- a/spec/lib/spree/i18n_spec.rb
+++ b/spec/lib/spree/i18n_spec.rb
@@ -3,7 +3,7 @@
 require 'rspec/expectations'
 require 'spree/i18n'
 
-describe "i18n" do
+RSpec.describe "i18n" do
   before do
     I18n.backend.store_translations(
       :en,
diff --git a/spec/lib/spree/localized_number_spec.rb b/spec/lib/spree/localized_number_spec.rb
index 81d632c972..31ce979d91 100644
--- a/spec/lib/spree/localized_number_spec.rb
+++ b/spec/lib/spree/localized_number_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'spree/localized_number'
 
-describe Spree::LocalizedNumber do
+RSpec.describe Spree::LocalizedNumber do
   describe ".parse" do
     context "with point separator" do
       it "captures the proper amount for a formatted string" do
diff --git a/spec/lib/spree/money_spec.rb b/spec/lib/spree/money_spec.rb
index b6f2fca897..e79443e920 100644
--- a/spec/lib/spree/money_spec.rb
+++ b/spec/lib/spree/money_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Money do
+RSpec.describe Spree::Money do
   include PreferencesHelper
 
   before do
diff --git a/spec/lib/stripe/account_connector_spec.rb b/spec/lib/stripe/account_connector_spec.rb
index b38bf88207..c399a620fe 100644
--- a/spec/lib/stripe/account_connector_spec.rb
+++ b/spec/lib/stripe/account_connector_spec.rb
@@ -5,7 +5,7 @@ require 'stripe/account_connector'
 require 'stripe/oauth'
 
 module Stripe
-  describe AccountConnector do
+  RSpec.describe AccountConnector do
     describe "create_account" do
       let(:user) { create(:user) }
       let(:enterprise) { create(:enterprise) }
diff --git a/spec/lib/stripe/authorize_response_patcher_spec.rb b/spec/lib/stripe/authorize_response_patcher_spec.rb
index 9ecb800ee2..c99b2da340 100644
--- a/spec/lib/stripe/authorize_response_patcher_spec.rb
+++ b/spec/lib/stripe/authorize_response_patcher_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Stripe
-  describe AuthorizeResponsePatcher do
+  RSpec.describe AuthorizeResponsePatcher do
     describe "#call!" do
       let(:patcher) { Stripe::AuthorizeResponsePatcher.new(response) }
       let(:params) { {} }
diff --git a/spec/lib/stripe/credit_card_cloner_spec.rb b/spec/lib/stripe/credit_card_cloner_spec.rb
index f9ef2b59fd..44acfb5373 100644
--- a/spec/lib/stripe/credit_card_cloner_spec.rb
+++ b/spec/lib/stripe/credit_card_cloner_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'stripe/credit_card_cloner'
 
 module Stripe
-  describe CreditCardCloner do
+  RSpec.describe CreditCardCloner do
     let!(:user) { create(:user, email: "apple.customer@example.com") }
     let!(:enterprise) { create(:enterprise) }
 
diff --git a/spec/lib/stripe/credit_card_remover_spec.rb b/spec/lib/stripe/credit_card_remover_spec.rb
index 39638ee82d..a5af7ba88a 100644
--- a/spec/lib/stripe/credit_card_remover_spec.rb
+++ b/spec/lib/stripe/credit_card_remover_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'stripe/credit_card_remover'
 
-describe Stripe::CreditCardRemover do
+RSpec.describe Stripe::CreditCardRemover do
   let(:credit_card) { create(:credit_card, gateway_payment_profile_id: pm_card.id, user:) }
 
   let!(:user) { create(:user, email: "apple.customer@example.com") }
diff --git a/spec/lib/stripe/payment_intent_validator_spec.rb b/spec/lib/stripe/payment_intent_validator_spec.rb
index 64713217fa..c3d917b614 100644
--- a/spec/lib/stripe/payment_intent_validator_spec.rb
+++ b/spec/lib/stripe/payment_intent_validator_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'stripe/payment_intent_validator'
 
-describe Stripe::PaymentIntentValidator do
+RSpec.describe Stripe::PaymentIntentValidator do
   let(:payment_method) {
     create(:stripe_sca_payment_method, distributor_ids: [create(:distributor_enterprise).id],
                                        preferred_enterprise_id: create(:enterprise).id)
diff --git a/spec/lib/stripe/profile_storer_spec.rb b/spec/lib/stripe/profile_storer_spec.rb
index 663db16165..972651ff2f 100644
--- a/spec/lib/stripe/profile_storer_spec.rb
+++ b/spec/lib/stripe/profile_storer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Stripe
-  describe ProfileStorer do
+  RSpec.describe ProfileStorer do
     include StripeStubs
 
     describe "create_customer_from_token", :vcr, :stripe_version do
diff --git a/spec/lib/stripe/webhook_handler_spec.rb b/spec/lib/stripe/webhook_handler_spec.rb
index df835ecf97..6750123fb4 100644
--- a/spec/lib/stripe/webhook_handler_spec.rb
+++ b/spec/lib/stripe/webhook_handler_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'stripe/webhook_handler'
 
 module Stripe
-  describe WebhookHandler do
+  RSpec.describe WebhookHandler do
     let(:event) { double(:event, type: 'some.event') }
     let(:handler) { WebhookHandler.new(event) }
 
diff --git a/spec/lib/tasks/data/remove_transient_data_spec.rb b/spec/lib/tasks/data/remove_transient_data_spec.rb
index af47e06475..ff2667d749 100644
--- a/spec/lib/tasks/data/remove_transient_data_spec.rb
+++ b/spec/lib/tasks/data/remove_transient_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'tasks/data/remove_transient_data'
 
-describe RemoveTransientData do
+RSpec.describe RemoveTransientData do
   describe '#call' do
     let(:retention_period) { RemoveTransientData::RETENTION_PERIOD }
 
diff --git a/spec/lib/tasks/data/truncate_data_rake_spec.rb b/spec/lib/tasks/data/truncate_data_rake_spec.rb
index d2f86fc826..a04221200a 100644
--- a/spec/lib/tasks/data/truncate_data_rake_spec.rb
+++ b/spec/lib/tasks/data/truncate_data_rake_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'truncate_data.rake' do
+RSpec.describe 'truncate_data.rake' do
   describe ':truncate' do
     context 'when months_to_keep is specified' do
       it 'truncates order cycles closed earlier than months_to_keep months ago' do
diff --git a/spec/lib/tasks/data/truncate_data_spec.rb b/spec/lib/tasks/data/truncate_data_spec.rb
index fe2b249d8e..e799ec3a02 100644
--- a/spec/lib/tasks/data/truncate_data_spec.rb
+++ b/spec/lib/tasks/data/truncate_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'tasks/data/truncate_data'
 
-describe TruncateData do
+RSpec.describe TruncateData do
   describe '#call' do
     before do
       allow(Spree::ReturnAuthorization).to receive(:delete_all)
diff --git a/spec/lib/tasks/enterprises_rake_spec.rb b/spec/lib/tasks/enterprises_rake_spec.rb
index dfcb91cebd..0ebf97b7d7 100644
--- a/spec/lib/tasks/enterprises_rake_spec.rb
+++ b/spec/lib/tasks/enterprises_rake_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'enterprises.rake' do
+RSpec.describe 'enterprises.rake' do
   before(:all) do
     Rake.application.rake_require("tasks/enterprises")
     Rake::Task.define_task(:environment)
diff --git a/spec/lib/tasks/reset_spec.rb b/spec/lib/tasks/reset_spec.rb
index 9c05cff671..99b0237bb5 100644
--- a/spec/lib/tasks/reset_spec.rb
+++ b/spec/lib/tasks/reset_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe "reset.rake" do
+RSpec.describe "reset.rake" do
   before(:all) do
     Rake.application.rake_require("tasks/reset")
     Rake::Task.define_task(:environment)
diff --git a/spec/lib/tasks/sample_data_rake_spec.rb b/spec/lib/tasks/sample_data_rake_spec.rb
index a22ebce9da..4fa798e53a 100644
--- a/spec/lib/tasks/sample_data_rake_spec.rb
+++ b/spec/lib/tasks/sample_data_rake_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'sample_data.rake' do
+RSpec.describe 'sample_data.rake' do
   before(:all) do
     Rake.application.rake_require 'tasks/sample_data'
     Rake::Task.define_task(:environment)
diff --git a/spec/lib/tasks/users_rake_spec.rb b/spec/lib/tasks/users_rake_spec.rb
index 5fdc6a0487..ebf5e8a5a1 100644
--- a/spec/lib/tasks/users_rake_spec.rb
+++ b/spec/lib/tasks/users_rake_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'users.rake' do
+RSpec.describe 'users.rake' do
   before do
     Rake.application.rake_require 'tasks/users'
     Rake::Task.define_task(:environment)
diff --git a/spec/mailers/enterprise_mailer_spec.rb b/spec/mailers/enterprise_mailer_spec.rb
index a9417a3841..e7de3e3a89 100644
--- a/spec/mailers/enterprise_mailer_spec.rb
+++ b/spec/mailers/enterprise_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseMailer do
+RSpec.describe EnterpriseMailer do
   let!(:enterprise) { create(:enterprise) }
   let!(:user) { create(:user) }
 
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 506a05d6b4..34206213d5 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::OrderMailer do
+RSpec.describe Spree::OrderMailer do
   describe '#confirm_email_for_customer' do
     subject(:email) { described_class.confirm_email_for_customer(order) }
 
diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index b6460e4f6a..b4e1be284a 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'yaml'
 
-describe ProducerMailer, type: :mailer do
+RSpec.describe ProducerMailer, type: :mailer do
   let!(:zone) { create(:zone_with_member) }
   let!(:tax_rate) {
     create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone:,
diff --git a/spec/mailers/report_mailer_spec.rb b/spec/mailers/report_mailer_spec.rb
index 54a63845ea..b23932d3a3 100644
--- a/spec/mailers/report_mailer_spec.rb
+++ b/spec/mailers/report_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReportMailer do
+RSpec.describe ReportMailer do
   describe "#report_ready" do
     subject(:email) {
       ReportMailer.with(
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
index f0ea130c64..e81ea4d0cb 100644
--- a/spec/mailers/shipment_mailer_spec.rb
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::ShipmentMailer do
+RSpec.describe Spree::ShipmentMailer do
   let(:shipment) do
     order = build(:order_with_distributor)
     product = build(:product, name: %{The "BEST" product})
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index 12cad33ece..93e4b82523 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SubscriptionMailer, type: :mailer do
+RSpec.describe SubscriptionMailer, type: :mailer do
   include ActionView::Helpers::SanitizeHelper
 
   describe '#placement_email' do
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index 181b93164e..191f84a344 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::TestMailer do
+RSpec.describe Spree::TestMailer do
   let(:user) { create(:user) }
 
   context ":from not set explicitly" do
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 62d144d87f..14dbb566f3 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::UserMailer do
+RSpec.describe Spree::UserMailer do
   let(:user) { build(:user) }
 
   describe '#signup_confirmation' do
diff --git a/spec/migrations/20240213044159_copy_oidc_data_to_oidc_accounts_spec.rb b/spec/migrations/20240213044159_copy_oidc_data_to_oidc_accounts_spec.rb
index d2bbd81694..8a134c8b59 100644
--- a/spec/migrations/20240213044159_copy_oidc_data_to_oidc_accounts_spec.rb
+++ b/spec/migrations/20240213044159_copy_oidc_data_to_oidc_accounts_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../db/migrate/20240213044159_copy_oidc_data_to_oidc_accounts'
 
-describe CopyOidcDataToOidcAccounts do
+RSpec.describe CopyOidcDataToOidcAccounts do
   describe "up" do
     let!(:user) { create(:user) }
     let!(:oidc_user) {
diff --git a/spec/migrations/20240502035220_update_n8n_url_spec.rb b/spec/migrations/20240502035220_update_n8n_url_spec.rb
index 9735f1126d..2c318dcf18 100644
--- a/spec/migrations/20240502035220_update_n8n_url_spec.rb
+++ b/spec/migrations/20240502035220_update_n8n_url_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../db/migrate/20240502035220_update_n8n_url'
 
-describe UpdateN8nUrl do
+RSpec.describe UpdateN8nUrl do
   # We may want to move this to a support file if this syntax is useful in
   # other places. Reference:
   # - https://stackoverflow.com/a/34969429/3377535
diff --git a/spec/migrations/convert_stripe_connect_to_stripe_sca_spec.rb b/spec/migrations/convert_stripe_connect_to_stripe_sca_spec.rb
index 45248ce68c..f107bb2b66 100644
--- a/spec/migrations/convert_stripe_connect_to_stripe_sca_spec.rb
+++ b/spec/migrations/convert_stripe_connect_to_stripe_sca_spec.rb
@@ -12,7 +12,7 @@ module Spree
   end
 end
 
-describe ConvertStripeConnectToStripeSca do
+RSpec.describe ConvertStripeConnectToStripeSca do
   let(:owner) { create(:distributor_enterprise) }
   let(:new_owner) { create(:distributor_enterprise) }
   let(:old_stripe_connect) {
diff --git a/spec/migrations/migrate_admin_tax_amounts_spec.rb b/spec/migrations/migrate_admin_tax_amounts_spec.rb
index b60c8ae762..41250be1cc 100644
--- a/spec/migrations/migrate_admin_tax_amounts_spec.rb
+++ b/spec/migrations/migrate_admin_tax_amounts_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../db/migrate/20210617203927_migrate_admin_tax_amounts'
 
-describe MigrateAdminTaxAmounts do
+RSpec.describe MigrateAdminTaxAmounts do
   subject { MigrateAdminTaxAmounts.new }
 
   let(:tax_category10) { create(:tax_category) }
diff --git a/spec/migrations/migrate_customer_names_spec.rb b/spec/migrations/migrate_customer_names_spec.rb
index 2e014efefa..9338e0e9a8 100644
--- a/spec/migrations/migrate_customer_names_spec.rb
+++ b/spec/migrations/migrate_customer_names_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../db/migrate/20211027140313_migrate_customer_names'
 
-describe MigrateCustomerNames do
+RSpec.describe MigrateCustomerNames do
   subject { MigrateCustomerNames.new }
 
   let!(:enterprise1) { create(:enterprise) }
diff --git a/spec/migrations/split_customer_names_spec.rb b/spec/migrations/split_customer_names_spec.rb
index 76c3803553..3d94e32edd 100644
--- a/spec/migrations/split_customer_names_spec.rb
+++ b/spec/migrations/split_customer_names_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../db/migrate/20220105085730_migrate_customers_data'
 
-describe MigrateCustomersData do
+RSpec.describe MigrateCustomersData do
   let!(:customer1) {
     create(:customer, name: "Timmy Test", first_name: "", last_name: "", bill_address: nil)
   }
diff --git a/spec/migrations/update_enterprise_instagram_links_spec.rb b/spec/migrations/update_enterprise_instagram_links_spec.rb
index 99a2a770f0..6dc5ec5ef3 100644
--- a/spec/migrations/update_enterprise_instagram_links_spec.rb
+++ b/spec/migrations/update_enterprise_instagram_links_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require Rails.root.join('db/migrate/20221208150521_update_enterprise_instagram_links.rb')
 
-describe UpdateEnterpriseInstagramLinks do
+RSpec.describe UpdateEnterpriseInstagramLinks do
   let!(:enterprise1) { create(:enterprise, instagram: "https://www.instagram.com/happyfarm") }
 
   let!(:enterprise2) { create(:enterprise, instagram: "@happyfarm") }
diff --git a/spec/models/adjustment_metadata_spec.rb b/spec/models/adjustment_metadata_spec.rb
index 66ae5bc6f0..9f4cd157b3 100644
--- a/spec/models/adjustment_metadata_spec.rb
+++ b/spec/models/adjustment_metadata_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AdjustmentMetadata do
+RSpec.describe AdjustmentMetadata do
   it { is_expected.to belong_to(:adjustment).required }
   it { is_expected.to belong_to(:enterprise).required }
 
diff --git a/spec/models/calculator/flat_percent_item_total_spec.rb b/spec/models/calculator/flat_percent_item_total_spec.rb
index 3305c7791a..8ffb10918a 100644
--- a/spec/models/calculator/flat_percent_item_total_spec.rb
+++ b/spec/models/calculator/flat_percent_item_total_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::FlatPercentItemTotal do
+RSpec.describe Calculator::FlatPercentItemTotal do
   let(:calculator) { Calculator::FlatPercentItemTotal.new }
   let(:line_item) { build_stubbed(:line_item, price: 10, quantity: 1) }
 
diff --git a/spec/models/calculator/flat_percent_per_item_spec.rb b/spec/models/calculator/flat_percent_per_item_spec.rb
index ac873a0ba7..c8efad27a6 100644
--- a/spec/models/calculator/flat_percent_per_item_spec.rb
+++ b/spec/models/calculator/flat_percent_per_item_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::FlatPercentPerItem do
+RSpec.describe Calculator::FlatPercentPerItem do
   let(:calculator) { Calculator::FlatPercentPerItem.new preferred_flat_percent: 20 }
 
   it { is_expected.to validate_numericality_of(:preferred_flat_percent) }
diff --git a/spec/models/calculator/flat_rate_spec.rb b/spec/models/calculator/flat_rate_spec.rb
index 92eaa864d0..6b8ced68a6 100644
--- a/spec/models/calculator/flat_rate_spec.rb
+++ b/spec/models/calculator/flat_rate_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::FlatRate do
+RSpec.describe Calculator::FlatRate do
   let(:calculator) { Calculator::FlatRate.new }
 
   before { allow(calculator).to receive_messages preferred_amount: 10 }
diff --git a/spec/models/calculator/flexi_rate_spec.rb b/spec/models/calculator/flexi_rate_spec.rb
index 6f33270b43..7129d1555e 100644
--- a/spec/models/calculator/flexi_rate_spec.rb
+++ b/spec/models/calculator/flexi_rate_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::FlexiRate do
+RSpec.describe Calculator::FlexiRate do
   let(:line_item) { build_stubbed(:line_item, quantity:) }
   let(:calculator) do
     Calculator::FlexiRate.new(
diff --git a/spec/models/calculator/per_item_spec.rb b/spec/models/calculator/per_item_spec.rb
index 914ca33dfa..78e324290a 100644
--- a/spec/models/calculator/per_item_spec.rb
+++ b/spec/models/calculator/per_item_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::PerItem do
+RSpec.describe Calculator::PerItem do
   let(:calculator) { Calculator::PerItem.new(preferred_amount: 10) }
   let(:shipping_calculable) { double(:calculable) }
   let(:line_item) { build_stubbed(:line_item, quantity: 5) }
diff --git a/spec/models/calculator/price_sack_spec.rb b/spec/models/calculator/price_sack_spec.rb
index afab174fe5..229f6b9cbf 100644
--- a/spec/models/calculator/price_sack_spec.rb
+++ b/spec/models/calculator/price_sack_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::PriceSack do
+RSpec.describe Calculator::PriceSack do
   let(:calculator) do
     calculator = Calculator::PriceSack.new
     calculator.preferred_minimal_amount = 5
diff --git a/spec/models/calculator/weight_spec.rb b/spec/models/calculator/weight_spec.rb
index 915562c7b1..ec7907f638 100644
--- a/spec/models/calculator/weight_spec.rb
+++ b/spec/models/calculator/weight_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Calculator::Weight do
+RSpec.describe Calculator::Weight do
   it "computes shipping cost for an order by total weight" do
     variant1 = build_stubbed(:variant, unit_value: 10_000)
     variant2 = build_stubbed(:variant, unit_value: 20_000)
diff --git a/spec/models/column_preference_spec.rb b/spec/models/column_preference_spec.rb
index 9a7e76a70a..99f6402987 100644
--- a/spec/models/column_preference_spec.rb
+++ b/spec/models/column_preference_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ColumnPreference, type: :model do
+RSpec.describe ColumnPreference, type: :model do
   subject {
     ColumnPreference.new(
       user:, action_name: :customers_index, column_name: :email
diff --git a/spec/models/concerns/balance_spec.rb b/spec/models/concerns/balance_spec.rb
index 9531f04816..dcf82dd601 100644
--- a/spec/models/concerns/balance_spec.rb
+++ b/spec/models/concerns/balance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Balance do
+RSpec.describe Balance do
   context "#new_outstanding_balance" do
     context 'when orders are in cart state' do
       let(:order) { build(:order, total: 100, payment_total: 10, state: 'cart') }
diff --git a/spec/models/concerns/calculated_adjustments_spec.rb b/spec/models/concerns/calculated_adjustments_spec.rb
index 3020088b0f..73238a055c 100644
--- a/spec/models/concerns/calculated_adjustments_spec.rb
+++ b/spec/models/concerns/calculated_adjustments_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 # Its pretty difficult to test this module in isolation b/c it needs to work in conjunction
 #   with an actual class that extends ActiveRecord::Base and has a corresponding table in the DB.
 #   So we'll just test it using Order and ShippingMethod. These classes are including the module.
-describe CalculatedAdjustments do
+RSpec.describe CalculatedAdjustments do
   let(:calculator) { build(:calculator) }
   let(:tax_rate) { Spree::TaxRate.new(calculator:) }
 
diff --git a/spec/models/concerns/order_shipment_spec.rb b/spec/models/concerns/order_shipment_spec.rb
index 26dbb3937c..fe5843ebf3 100644
--- a/spec/models/concerns/order_shipment_spec.rb
+++ b/spec/models/concerns/order_shipment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderShipment do
+RSpec.describe OrderShipment do
   let(:order) { create(:order) }
 
   describe "#shipping_method" do
diff --git a/spec/models/concerns/product_stock_spec.rb b/spec/models/concerns/product_stock_spec.rb
index 0024035f91..751f57058a 100644
--- a/spec/models/concerns/product_stock_spec.rb
+++ b/spec/models/concerns/product_stock_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe ProductStock do
+RSpec.describe ProductStock do
   let(:product) { create(:simple_product) }
 
   context "when product has one variant" do
diff --git a/spec/models/concerns/variant_stock_spec.rb b/spec/models/concerns/variant_stock_spec.rb
index daff2825fc..4a25c58355 100644
--- a/spec/models/concerns/variant_stock_spec.rb
+++ b/spec/models/concerns/variant_stock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VariantStock do
+RSpec.describe VariantStock do
   let(:variant) { create(:variant) }
 
   describe '#after_save' do
diff --git a/spec/models/content_configuration_spec.rb b/spec/models/content_configuration_spec.rb
index 07f8bcc18d..4b29dd4904 100644
--- a/spec/models/content_configuration_spec.rb
+++ b/spec/models/content_configuration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContentConfiguration do
+RSpec.describe ContentConfiguration do
   describe "default logos and home_hero" do
     it "sets a default url with existing image" do
       expect(image_exist?(ContentConfig.url_for(:logo))).to be true
diff --git a/spec/models/coordinator_fee_spec.rb b/spec/models/coordinator_fee_spec.rb
index 5e3a8765b8..980935c0a9 100644
--- a/spec/models/coordinator_fee_spec.rb
+++ b/spec/models/coordinator_fee_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CoordinatorFee do
+RSpec.describe CoordinatorFee do
   it { is_expected.to belong_to(:order_cycle).required }
   it { is_expected.to belong_to(:enterprise_fee).required }
 end
diff --git a/spec/models/custom_tab_spec.rb b/spec/models/custom_tab_spec.rb
index f192068f63..b35af1c71c 100644
--- a/spec/models/custom_tab_spec.rb
+++ b/spec/models/custom_tab_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CustomTab do
+RSpec.describe CustomTab do
   describe 'associations' do
     it { is_expected.to belong_to(:enterprise).required }
   end
diff --git a/spec/models/customer_spec.rb b/spec/models/customer_spec.rb
index fc5847239c..bb488b6993 100644
--- a/spec/models/customer_spec.rb
+++ b/spec/models/customer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Customer, type: :model do
+RSpec.describe Customer, type: :model do
   it { is_expected.to belong_to(:enterprise).required }
   it { is_expected.to belong_to(:user).optional }
   it { is_expected.to belong_to(:bill_address).optional }
diff --git a/spec/models/enterprise_caching_spec.rb b/spec/models/enterprise_caching_spec.rb
index e66063abc1..5f10a52398 100644
--- a/spec/models/enterprise_caching_spec.rb
+++ b/spec/models/enterprise_caching_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Enterprise do
+RSpec.describe Enterprise do
   context "key-based caching invalidation" do
     describe "is touched when a(n)" do
       let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/models/enterprise_fee_adjustments_spec.rb b/spec/models/enterprise_fee_adjustments_spec.rb
index 8e00118b11..df281deeba 100644
--- a/spec/models/enterprise_fee_adjustments_spec.rb
+++ b/spec/models/enterprise_fee_adjustments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseFeeAdjustments do
+RSpec.describe EnterpriseFeeAdjustments do
   let(:tax_rate) { create(:tax_rate, amount: 0.1) }
   let(:line_item) { create(:line_item) }
   let(:line_item2) { create(:line_item) }
diff --git a/spec/models/enterprise_fee_spec.rb b/spec/models/enterprise_fee_spec.rb
index 9a81c0d132..e2881f3a05 100644
--- a/spec/models/enterprise_fee_spec.rb
+++ b/spec/models/enterprise_fee_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseFee do
+RSpec.describe EnterpriseFee do
   describe "associations" do
     it { is_expected.to belong_to(:enterprise).required }
     it { is_expected.to belong_to(:tax_category).optional }
diff --git a/spec/models/enterprise_group_spec.rb b/spec/models/enterprise_group_spec.rb
index 4a74fa65f8..8902e7cb4e 100644
--- a/spec/models/enterprise_group_spec.rb
+++ b/spec/models/enterprise_group_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseGroup do
+RSpec.describe EnterpriseGroup do
   describe "associations" do
     subject { build(:enterprise_group) }
 
diff --git a/spec/models/enterprise_relationship_spec.rb b/spec/models/enterprise_relationship_spec.rb
index d0abff9ebe..dfdc2df022 100644
--- a/spec/models/enterprise_relationship_spec.rb
+++ b/spec/models/enterprise_relationship_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnterpriseRelationship do
+RSpec.describe EnterpriseRelationship do
   describe "scopes" do
     let(:e1)  { create(:enterprise, name: 'A') }
     let(:e2)  { create(:enterprise, name: 'B') }
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index 8fd7c29f1f..300dd84ccb 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Enterprise do
+RSpec.describe Enterprise do
   describe "sending emails" do
     describe "on creation" do
       let!(:user) { create(:user) }
diff --git a/spec/models/exchange_spec.rb b/spec/models/exchange_spec.rb
index 69dd37d3af..b2a9c92f35 100644
--- a/spec/models/exchange_spec.rb
+++ b/spec/models/exchange_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Exchange do
+RSpec.describe Exchange do
   it "should be valid when built from factory" do
     expect(build(:exchange)).to be_valid
   end
diff --git a/spec/models/invoice/data_presenter/line_item_spec.rb b/spec/models/invoice/data_presenter/line_item_spec.rb
index 14d3df8c9f..81abe073bd 100644
--- a/spec/models/invoice/data_presenter/line_item_spec.rb
+++ b/spec/models/invoice/data_presenter/line_item_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Invoice::DataPresenter::LineItem do
+RSpec.describe Invoice::DataPresenter::LineItem do
   subject(:presenter) { described_class.new(data) }
 
   describe "#amount_with_adjustments_without_taxes" do
diff --git a/spec/models/invoice/data_presenter_spec.rb b/spec/models/invoice/data_presenter_spec.rb
index bd35562762..555aeeb952 100644
--- a/spec/models/invoice/data_presenter_spec.rb
+++ b/spec/models/invoice/data_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Invoice::DataPresenter do
+RSpec.describe Invoice::DataPresenter do
   context "#display_date" do
     let(:invoice) { double(:invoice, date: '2023-08-01') }
 
diff --git a/spec/models/oidc_account_spec.rb b/spec/models/oidc_account_spec.rb
index 7d0ef6939e..f6eb2d792d 100644
--- a/spec/models/oidc_account_spec.rb
+++ b/spec/models/oidc_account_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OidcAccount, type: :model do
+RSpec.describe OidcAccount, type: :model do
   describe "associations and validations" do
     subject {
       OidcAccount.new(
diff --git a/spec/models/order_balance_spec.rb b/spec/models/order_balance_spec.rb
index a7f1aedc66..7e3247900f 100644
--- a/spec/models/order_balance_spec.rb
+++ b/spec/models/order_balance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderBalance do
+RSpec.describe OrderBalance do
   subject(:order_balance) { described_class.new(order) }
   let(:order) { build(:order) }
   let(:user) { order.user }
diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb
index 912ff2ec15..39095af2f6 100644
--- a/spec/models/order_cycle_spec.rb
+++ b/spec/models/order_cycle_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycle do
+RSpec.describe OrderCycle do
   it "should be valid when built from factory" do
     expect(build(:simple_order_cycle)).to be_valid
   end
diff --git a/spec/models/product_import/entry_processor_spec.rb b/spec/models/product_import/entry_processor_spec.rb
index 69defea209..1306080ef8 100644
--- a/spec/models/product_import/entry_processor_spec.rb
+++ b/spec/models/product_import/entry_processor_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductImport::EntryProcessor do
+RSpec.describe ProductImport::EntryProcessor do
   let(:importer) { double(:importer) }
   let(:validator) { double(:validator) }
   let(:import_settings) { double(:import_settings) }
diff --git a/spec/models/product_import/entry_validator_spec.rb b/spec/models/product_import/entry_validator_spec.rb
index 4648298545..3f9ef97209 100644
--- a/spec/models/product_import/entry_validator_spec.rb
+++ b/spec/models/product_import/entry_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductImport::EntryValidator do
+RSpec.describe ProductImport::EntryValidator do
   let(:current_user) { double(:current_user) }
   let(:import_time) { double(:import_time) }
   let(:spreadsheet_data) { double(:spreadsheet_data) }
diff --git a/spec/models/product_import/inventory_reset_strategy_spec.rb b/spec/models/product_import/inventory_reset_strategy_spec.rb
index 3eed624486..86a0b67de4 100644
--- a/spec/models/product_import/inventory_reset_strategy_spec.rb
+++ b/spec/models/product_import/inventory_reset_strategy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductImport::InventoryResetStrategy do
+RSpec.describe ProductImport::InventoryResetStrategy do
   let(:inventory_reset) { described_class.new(excluded_items_ids) }
 
   describe '#reset' do
diff --git a/spec/models/product_import/reset_absent_spec.rb b/spec/models/product_import/reset_absent_spec.rb
index c853d3e79c..6a1bf2a56a 100644
--- a/spec/models/product_import/reset_absent_spec.rb
+++ b/spec/models/product_import/reset_absent_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module ProductImport
-  describe ResetAbsent do
+  RSpec.describe ResetAbsent do
     let(:entry_processor) { instance_double(EntryProcessor) }
 
     let(:reset_absent) do
diff --git a/spec/models/product_import/settings_spec.rb b/spec/models/product_import/settings_spec.rb
index ab383b89a2..1eaa119543 100644
--- a/spec/models/product_import/settings_spec.rb
+++ b/spec/models/product_import/settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductImport::Settings do
+RSpec.describe ProductImport::Settings do
   let(:settings) { described_class.new(import_settings) }
 
   describe '#defaults' do
diff --git a/spec/models/product_importer_spec.rb b/spec/models/product_importer_spec.rb
index ff6470d782..39b6508575 100644
--- a/spec/models/product_importer_spec.rb
+++ b/spec/models/product_importer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/permissions'
 
-describe ProductImport::ProductImporter do
+RSpec.describe ProductImport::ProductImporter do
   let!(:admin) { create(:admin_user) }
   let!(:user) { create(:user) }
   let!(:user2) { create(:user) }
diff --git a/spec/models/proxy_order_spec.rb b/spec/models/proxy_order_spec.rb
index 0061284d5b..7fe6b76620 100644
--- a/spec/models/proxy_order_spec.rb
+++ b/spec/models/proxy_order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProxyOrder, type: :model do
+RSpec.describe ProxyOrder, type: :model do
   describe "cancel" do
     let(:order_cycle) { create(:simple_order_cycle) }
     let(:subscription) { create(:subscription) }
diff --git a/spec/models/report_blob_spec.rb b/spec/models/report_blob_spec.rb
index 7df91b4344..764925ba11 100644
--- a/spec/models/report_blob_spec.rb
+++ b/spec/models/report_blob_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReportBlob, type: :model do
+RSpec.describe ReportBlob, type: :model do
   it "preserves UTF-8 content" do
     content = "This works. ✓"
 
diff --git a/spec/models/spree/ability_spec.rb b/spec/models/spree/ability_spec.rb
index b787e64a87..9ff691368e 100644
--- a/spec/models/spree/ability_spec.rb
+++ b/spec/models/spree/ability_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'cancan/matchers'
 require 'support/ability_helpers'
 
-describe Spree::Ability do
+RSpec.describe Spree::Ability do
   let(:user) { create(:user) }
   let(:subject) { Spree::Ability.new(user) }
   let(:token) { nil }
diff --git a/spec/models/spree/address_spec.rb b/spec/models/spree/address_spec.rb
index c0b4f17234..712a4ad6ed 100644
--- a/spec/models/spree/address_spec.rb
+++ b/spec/models/spree/address_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Address do
+RSpec.describe Spree::Address do
   describe "clone" do
     it "creates a copy of the address with the exception of the id, " \
        "updated_at and created_at attributes" do
diff --git a/spec/models/spree/addresses_spec.rb b/spec/models/spree/addresses_spec.rb
index 1b76aa51ce..e2aa0ea9e6 100644
--- a/spec/models/spree/addresses_spec.rb
+++ b/spec/models/spree/addresses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Address do
+RSpec.describe Spree::Address do
   let(:address) { build(:address) }
   let(:enterprise_address) { build(:address, enterprise: build(:enterprise)) }
 
diff --git a/spec/models/spree/adjustment_spec.rb b/spec/models/spree/adjustment_spec.rb
index f3e08d06fe..9682d045ee 100644
--- a/spec/models/spree/adjustment_spec.rb
+++ b/spec/models/spree/adjustment_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Adjustment do
+  RSpec.describe Adjustment do
     let(:order) { build(:order) }
     let(:adjustment) { Spree::Adjustment.create(label: "Adjustment", amount: 5) }
 
diff --git a/spec/models/spree/app_configuration_spec.rb b/spec/models/spree/app_configuration_spec.rb
index 607dc8501b..9a0843fb30 100644
--- a/spec/models/spree/app_configuration_spec.rb
+++ b/spec/models/spree/app_configuration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::AppConfiguration do
+RSpec.describe Spree::AppConfiguration do
   let(:prefs) { Rails.application.config.spree.preferences }
 
   it "should be available from the environment" do
diff --git a/spec/models/spree/asset_spec.rb b/spec/models/spree/asset_spec.rb
index d8567c4d74..2268537256 100644
--- a/spec/models/spree/asset_spec.rb
+++ b/spec/models/spree/asset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Asset do
+RSpec.describe Spree::Asset do
   describe "#viewable" do
     it "touches association" do
       product = create(:product)
diff --git a/spec/models/spree/calculator_spec.rb b/spec/models/spree/calculator_spec.rb
index a2e8daf912..85d6c4a908 100644
--- a/spec/models/spree/calculator_spec.rb
+++ b/spec/models/spree/calculator_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Calculator do
+  RSpec.describe Calculator do
     let(:calculator) { Spree::Calculator.new }
     let!(:enterprise) { create(:enterprise) }
     let!(:order) { create(:order) }
diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index 1a0468ec28..749bdea460 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe CreditCard do
+  RSpec.describe CreditCard do
     let(:valid_credit_card_attributes) {
       {
         number: '4111111111111111',
diff --git a/spec/models/spree/gateway/stripe_sca_spec.rb b/spec/models/spree/gateway/stripe_sca_spec.rb
index f3191c09d4..1b9c28863e 100644
--- a/spec/models/spree/gateway/stripe_sca_spec.rb
+++ b/spec/models/spree/gateway/stripe_sca_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Gateway::StripeSCA, :vcr, :stripe_version, type: :model do
+RSpec.describe Spree::Gateway::StripeSCA, :vcr, :stripe_version, type: :model do
   let(:order) { create(:order_ready_for_payment) }
 
   let(:year_valid) { Time.zone.now.year.next }
diff --git a/spec/models/spree/gateway_spec.rb b/spec/models/spree/gateway_spec.rb
index 9bf43378f4..23b0b97d96 100644
--- a/spec/models/spree/gateway_spec.rb
+++ b/spec/models/spree/gateway_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Gateway do
+RSpec.describe Spree::Gateway do
   let(:test_gateway) do
     Class.new(Spree::Gateway) do
       def provider_class
diff --git a/spec/models/spree/gateway_tagging_spec.rb b/spec/models/spree/gateway_tagging_spec.rb
index 410ef1ec35..6ba82372e3 100644
--- a/spec/models/spree/gateway_tagging_spec.rb
+++ b/spec/models/spree/gateway_tagging_spec.rb
@@ -8,7 +8,7 @@ require "spec_helper"
 #
 # This spec tests several descendants for their taggability. The tests are in
 # a separate file, because they cover one aspect of several classes.
-shared_examples "taggable" do |expected_taggable_type|
+RSpec.shared_examples "taggable" do |expected_taggable_type|
   it "provides a tag list" do
     expect(subject.tag_list).to eq []
   end
@@ -22,7 +22,7 @@ shared_examples "taggable" do |expected_taggable_type|
 end
 
 module Spree
-  describe "PaymentMethod and descendants" do
+  RSpec.describe "PaymentMethod and descendants" do
     let(:shop) { create(:enterprise) }
     let(:valid_subject) do
       # Supply required parameters so that it can be saved to attach taggings.
diff --git a/spec/models/spree/image_spec.rb b/spec/models/spree/image_spec.rb
index 3b80fb686c..115c20b526 100644
--- a/spec/models/spree/image_spec.rb
+++ b/spec/models/spree/image_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Image do
+  RSpec.describe Image do
     include FileHelper
 
     subject {
diff --git a/spec/models/spree/inventory_unit_spec.rb b/spec/models/spree/inventory_unit_spec.rb
index 964e57c4c4..e4743b652e 100644
--- a/spec/models/spree/inventory_unit_spec.rb
+++ b/spec/models/spree/inventory_unit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::InventoryUnit do
+RSpec.describe Spree::InventoryUnit do
   let(:stock_location) { create(:stock_location_with_items) }
   let(:stock_item) { stock_location.stock_items.order(:id).first }
 
diff --git a/spec/models/spree/line_item_spec.rb b/spec/models/spree/line_item_spec.rb
index fbc6f753c5..ec596cec40 100644
--- a/spec/models/spree/line_item_spec.rb
+++ b/spec/models/spree/line_item_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe LineItem do
+  RSpec.describe LineItem do
     let(:order) { create :order_with_line_items, line_items_count: 1 }
     let(:line_item) { order.line_items.first }
 
@@ -803,7 +803,7 @@ module Spree
     end
   end
 
-  describe "searching with ransack" do
+  RSpec.describe "searching with ransack" do
     let(:order_cycle1) { create(:order_cycle) }
     let(:order_cycle2) { create(:order_cycle) }
     let(:product1) { create(:product, supplier: create(:supplier_enterprise)) }
diff --git a/spec/models/spree/order/address_spec.rb b/spec/models/spree/order/address_spec.rb
index 78ad56a0ef..d85110c43b 100644
--- a/spec/models/spree/order/address_spec.rb
+++ b/spec/models/spree/order/address_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order do
+RSpec.describe Spree::Order do
   let(:order) { Spree::Order.new }
 
   context 'validation' do
diff --git a/spec/models/spree/order/adjustments_spec.rb b/spec/models/spree/order/adjustments_spec.rb
index 4c2daf5ade..a204822061 100644
--- a/spec/models/spree/order/adjustments_spec.rb
+++ b/spec/models/spree/order/adjustments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order do
+RSpec.describe Spree::Order do
   let(:order) { Spree::Order.new }
 
   context "totaling adjustments" do
diff --git a/spec/models/spree/order/callbacks_spec.rb b/spec/models/spree/order/callbacks_spec.rb
index ed5b4c2c35..9918b93157 100644
--- a/spec/models/spree/order/callbacks_spec.rb
+++ b/spec/models/spree/order/callbacks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order do
+RSpec.describe Spree::Order do
   let(:order) { build(:order) }
   before do
     Spree::Order.define_state_machine!
diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index a8686917b2..1925b1ac15 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order::Checkout do
+RSpec.describe Spree::Order::Checkout do
   let(:order) { Spree::Order.new }
 
   context "with default state machine" do
diff --git a/spec/models/spree/order/payment_spec.rb b/spec/models/spree/order/payment_spec.rb
index 2eb15a022c..2e3af6e953 100644
--- a/spec/models/spree/order/payment_spec.rb
+++ b/spec/models/spree/order/payment_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::Order do
+  RSpec.describe Spree::Order do
     before { Stripe.api_key = "sk_test_12345" }
     let(:order) { build(:order) }
     let(:updater) { OrderManagement::Order::Updater.new(order) }
diff --git a/spec/models/spree/order/state_machine_spec.rb b/spec/models/spree/order/state_machine_spec.rb
index 25eea3e212..69908b781e 100644
--- a/spec/models/spree/order/state_machine_spec.rb
+++ b/spec/models/spree/order/state_machine_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order do
+RSpec.describe Spree::Order do
   let(:order) { Spree::Order.new }
   before do
     # Ensure state machine has been re-defined correctly
diff --git a/spec/models/spree/order/tax_spec.rb b/spec/models/spree/order/tax_spec.rb
index 1e1bb80f7c..39cae12848 100644
--- a/spec/models/spree/order/tax_spec.rb
+++ b/spec/models/spree/order/tax_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::Order do
+  RSpec.describe Spree::Order do
     let(:order) { build(:order) }
 
     context "#tax_zone" do
diff --git a/spec/models/spree/order_contents_spec.rb b/spec/models/spree/order_contents_spec.rb
index 4355a4f8a7..b31d685ea3 100644
--- a/spec/models/spree/order_contents_spec.rb
+++ b/spec/models/spree/order_contents_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::OrderContents do
+RSpec.describe Spree::OrderContents do
   let!(:order) { create(:order) }
   let!(:variant) { create(:variant) }
   subject { described_class.new(order) }
diff --git a/spec/models/spree/order_inventory_spec.rb b/spec/models/spree/order_inventory_spec.rb
index b363fa62bb..0aa07585f5 100644
--- a/spec/models/spree/order_inventory_spec.rb
+++ b/spec/models/spree/order_inventory_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::OrderInventory do
+RSpec.describe Spree::OrderInventory do
   let(:order) { create :completed_order_with_totals }
   let(:line_item) { order.line_items.first }
   subject { described_class.new(order) }
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 9d21351f42..ec49b695cd 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Order do
+RSpec.describe Spree::Order do
   let(:user) { build(:user, email: "spree@example.com") }
   let(:order) { build(:order, user:) }
 
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index 634ed0d672..877164f8b4 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 class Spree::Gateway::Test < Spree::Gateway
 end
 
-describe Spree::PaymentMethod do
+RSpec.describe Spree::PaymentMethod do
   describe ".managed_by scope" do
     subject! { create(:payment_method) }
     let(:owner) { subject.distributors.first.owner }
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 26edb058ad..be09f52539 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Payment do
+RSpec.describe Spree::Payment do
   context 'original specs from Spree' do
     before { Stripe.api_key = "sk_test_12345" }
     let(:order) { create(:order) }
diff --git a/spec/models/spree/preference_spec.rb b/spec/models/spree/preference_spec.rb
index b70cf1bc1a..636c1d15c9 100644
--- a/spec/models/spree/preference_spec.rb
+++ b/spec/models/spree/preference_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Preference do
+RSpec.describe Spree::Preference do
   it "should require a key" do
     @preference = Spree::Preference.new
     @preference.key = :test
diff --git a/spec/models/spree/preferences/configuration_spec.rb b/spec/models/spree/preferences/configuration_spec.rb
index fc4b51a709..a309883dcd 100644
--- a/spec/models/spree/preferences/configuration_spec.rb
+++ b/spec/models/spree/preferences/configuration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Preferences::Configuration do
+RSpec.describe Spree::Preferences::Configuration do
   let(:config) do
     Class.new(Spree::Preferences::Configuration) do
       preference :color, :string, default: :blue
diff --git a/spec/models/spree/preferences/preferable_spec.rb b/spec/models/spree/preferences/preferable_spec.rb
index 4cf412c392..465b4f858e 100644
--- a/spec/models/spree/preferences/preferable_spec.rb
+++ b/spec/models/spree/preferences/preferable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Preferences::Preferable do
+RSpec.describe Spree::Preferences::Preferable do
   a_class = A =
     Class.new do
       include Spree::Preferences::Preferable
diff --git a/spec/models/spree/preferences/store_spec.rb b/spec/models/spree/preferences/store_spec.rb
index 7d5995e97a..d8d2b4d1ec 100644
--- a/spec/models/spree/preferences/store_spec.rb
+++ b/spec/models/spree/preferences/store_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Preferences::Store do
+RSpec.describe Spree::Preferences::Store do
   before :each do
     @store = Spree::Preferences::StoreInstance.new
   end
diff --git a/spec/models/spree/price_spec.rb b/spec/models/spree/price_spec.rb
index d0fd0ad44f..441a7a185b 100644
--- a/spec/models/spree/price_spec.rb
+++ b/spec/models/spree/price_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Price do
+  RSpec.describe Price do
     let(:variant) { create(:variant) }
     let(:price) { variant.default_price }
 
diff --git a/spec/models/spree/product_property_spec.rb b/spec/models/spree/product_property_spec.rb
index c99820f815..1af2043ac0 100644
--- a/spec/models/spree/product_property_spec.rb
+++ b/spec/models/spree/product_property_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::ProductProperty do
+RSpec.describe Spree::ProductProperty do
   context "validations" do
     it "should validate length of value" do
       pp = create(:product_property)
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 7efd2da024..15667125c3 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'spree/core/product_duplicator'
 
 module Spree
-  describe Product do
+  RSpec.describe Product do
     context 'product instance' do
       let(:product) { create(:product) }
 
@@ -750,7 +750,7 @@ module Spree
     end
   end
 
-  describe "product import" do
+  RSpec.describe "product import" do
     describe "finding the most recent import date of the variants" do
       let!(:product) { create(:product) }
 
diff --git a/spec/models/spree/return_authorization_spec.rb b/spec/models/spree/return_authorization_spec.rb
index 68249cedc3..2d0c0df31c 100644
--- a/spec/models/spree/return_authorization_spec.rb
+++ b/spec/models/spree/return_authorization_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::ReturnAuthorization do
+RSpec.describe Spree::ReturnAuthorization do
   let(:order) { create(:shipped_order) }
   let(:variant) { order.shipments.first.inventory_units.first.variant }
   let(:return_authorization) { Spree::ReturnAuthorization.new(order:) }
diff --git a/spec/models/spree/shipment_spec.rb b/spec/models/spree/shipment_spec.rb
index fc2b31b272..4b4f70318c 100644
--- a/spec/models/spree/shipment_spec.rb
+++ b/spec/models/spree/shipment_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'benchmark'
 
-describe Spree::Shipment do
+RSpec.describe Spree::Shipment do
   let(:order) { build(:order) }
   let(:shipping_method) { build(:shipping_method, name: "UPS") }
   let(:shipment) do
diff --git a/spec/models/spree/shipping_method_spec.rb b/spec/models/spree/shipping_method_spec.rb
index 839367c8d1..0a89467611 100644
--- a/spec/models/spree/shipping_method_spec.rb
+++ b/spec/models/spree/shipping_method_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe ShippingMethod do
+  RSpec.describe ShippingMethod do
     it "is valid when built from factory" do
       expect(
         build(
diff --git a/spec/models/spree/shipping_rate_spec.rb b/spec/models/spree/shipping_rate_spec.rb
index 5090d285e9..3343355edf 100644
--- a/spec/models/spree/shipping_rate_spec.rb
+++ b/spec/models/spree/shipping_rate_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::ShippingRate do
+RSpec.describe Spree::ShippingRate do
   let(:shipment) { create(:shipment) }
   let(:shipping_method) { build_stubbed(:shipping_method) }
   let(:shipping_rate) {
diff --git a/spec/models/spree/state_spec.rb b/spec/models/spree/state_spec.rb
index 47a3b8552d..efe83bc41e 100644
--- a/spec/models/spree/state_spec.rb
+++ b/spec/models/spree/state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::State do
+RSpec.describe Spree::State do
   before(:all) do
     Spree::State.destroy_all
   end
diff --git a/spec/models/spree/stock/availability_validator_spec.rb b/spec/models/spree/stock/availability_validator_spec.rb
index d7e39ed175..91a7f0a2fe 100644
--- a/spec/models/spree/stock/availability_validator_spec.rb
+++ b/spec/models/spree/stock/availability_validator_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe AvailabilityValidator do
+    RSpec.describe AvailabilityValidator do
       let(:validator) { AvailabilityValidator.new({}) }
 
       context "line item without existing inventory units" do
diff --git a/spec/models/spree/stock/quantifier_spec.rb b/spec/models/spree/stock/quantifier_spec.rb
index 2a06f74344..d697a668d8 100644
--- a/spec/models/spree/stock/quantifier_spec.rb
+++ b/spec/models/spree/stock/quantifier_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe Quantifier do
+    RSpec.describe Quantifier do
       let(:quantifier) { Spree::Stock::Quantifier.new(variant) }
       let(:variant) { create(:variant, on_hand: 99) }
 
diff --git a/spec/models/spree/stock_location_spec.rb b/spec/models/spree/stock_location_spec.rb
index 86996b40b4..1efad18c9b 100644
--- a/spec/models/spree/stock_location_spec.rb
+++ b/spec/models/spree/stock_location_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe StockLocation do
+  RSpec.describe StockLocation do
     subject { create(:stock_location_with_items, backorderable_default: true) }
     let(:stock_item) { subject.stock_items.order(:id).first }
     let(:variant) { stock_item.variant }
diff --git a/spec/models/spree/stock_movement_spec.rb b/spec/models/spree/stock_movement_spec.rb
index 251ed56e5c..19ff09341c 100644
--- a/spec/models/spree/stock_movement_spec.rb
+++ b/spec/models/spree/stock_movement_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::StockMovement do
+RSpec.describe Spree::StockMovement do
   let(:stock_location) { create(:stock_location_with_items) }
   let(:stock_item) { stock_location.stock_items.order(:id).first }
   subject { build(:stock_movement, stock_item:) }
diff --git a/spec/models/spree/tax_category_spec.rb b/spec/models/spree/tax_category_spec.rb
index 77e9a02501..ce86c94017 100644
--- a/spec/models/spree/tax_category_spec.rb
+++ b/spec/models/spree/tax_category_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::TaxCategory do
+RSpec.describe Spree::TaxCategory do
   context 'default tax category' do
     let(:tax_category) { create(:tax_category) }
     let(:new_tax_category) { create(:tax_category) }
diff --git a/spec/models/spree/tax_rate_spec.rb b/spec/models/spree/tax_rate_spec.rb
index 5437ab2182..9d58cd024b 100644
--- a/spec/models/spree/tax_rate_spec.rb
+++ b/spec/models/spree/tax_rate_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe TaxRate do
+  RSpec.describe TaxRate do
     describe "#match" do
       let!(:zone) { create(:zone_with_member) }
       let!(:order) { create(:order, distributor: hub, bill_address: create(:address)) }
diff --git a/spec/models/spree/taxon_spec.rb b/spec/models/spree/taxon_spec.rb
index 7f481413df..34bdda4395 100644
--- a/spec/models/spree/taxon_spec.rb
+++ b/spec/models/spree/taxon_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Taxon do
+  RSpec.describe Taxon do
     let(:taxon) { Spree::Taxon.new(name: "Ruby on Rails") }
 
     let(:e) { create(:supplier_enterprise) }
diff --git a/spec/models/spree/taxonomy_spec.rb b/spec/models/spree/taxonomy_spec.rb
index 2ead3dcc0e..1ace138313 100644
--- a/spec/models/spree/taxonomy_spec.rb
+++ b/spec/models/spree/taxonomy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Taxonomy do
+RSpec.describe Spree::Taxonomy do
   context "#destroy" do
     before do
       @taxonomy = create(:taxonomy)
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 368792f8ed..c53b8d7845 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::User do
+RSpec.describe Spree::User do
   describe "associations" do
     it { is_expected.to have_many(:owned_enterprises) }
     it { is_expected.to have_many(:webhook_endpoints).dependent(:destroy) }
diff --git a/spec/models/spree/variant_spec.rb b/spec/models/spree/variant_spec.rb
index 1771e860a1..832cb6d931 100644
--- a/spec/models/spree/variant_spec.rb
+++ b/spec/models/spree/variant_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'spree/localized_number'
 
-describe Spree::Variant do
+RSpec.describe Spree::Variant do
   subject(:variant) { build(:variant) }
 
   it { is_expected.to have_many :semantic_links }
diff --git a/spec/models/spree/zone_spec.rb b/spec/models/spree/zone_spec.rb
index ce28024caf..9be11552ad 100644
--- a/spec/models/spree/zone_spec.rb
+++ b/spec/models/spree/zone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Spree::Zone do
+RSpec.describe Spree::Zone do
   context "#match" do
     let(:country_zone) { create(:zone, name: 'CountryZone') }
     let(:country) do
diff --git a/spec/models/stripe_account_spec.rb b/spec/models/stripe_account_spec.rb
index 1de1df4b50..9614344eb1 100644
--- a/spec/models/stripe_account_spec.rb
+++ b/spec/models/stripe_account_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'stripe/oauth'
 
-describe StripeAccount do
+RSpec.describe StripeAccount do
   describe "deauthorize_and_destroy", :vcr, :stripe_version do
     let!(:enterprise) { create(:enterprise) }
     let!(:enterprise2) { create(:enterprise) }
diff --git a/spec/models/subscription_line_item_spec.rb b/spec/models/subscription_line_item_spec.rb
index bc31544cbc..7aef546a5d 100644
--- a/spec/models/subscription_line_item_spec.rb
+++ b/spec/models/subscription_line_item_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SubscriptionLineItem, model: true do
+RSpec.describe SubscriptionLineItem, model: true do
   describe "validations" do
     it "requires a subscription" do
       expect(subject).to validate_presence_of :subscription
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index 29e2d0c22e..b4e3eee043 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Subscription, type: :model do
+RSpec.describe Subscription, type: :model do
   describe "associations" do
     it { expect(subject).to belong_to(:shop).optional }
     it { expect(subject).to belong_to(:customer).optional }
diff --git a/spec/models/tag_rule/filter_order_cycles_spec.rb b/spec/models/tag_rule/filter_order_cycles_spec.rb
index 661b18b8af..c5fbbfe12a 100644
--- a/spec/models/tag_rule/filter_order_cycles_spec.rb
+++ b/spec/models/tag_rule/filter_order_cycles_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagRule::FilterOrderCycles, type: :model do
+RSpec.describe TagRule::FilterOrderCycles, type: :model do
   let!(:tag_rule) { build_stubbed(:filter_order_cycles_tag_rule) }
 
   describe "determining whether tags match for a given exchange" do
diff --git a/spec/models/tag_rule/filter_payment_methods_spec.rb b/spec/models/tag_rule/filter_payment_methods_spec.rb
index 59d39aaacf..c7d88ad4ed 100644
--- a/spec/models/tag_rule/filter_payment_methods_spec.rb
+++ b/spec/models/tag_rule/filter_payment_methods_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagRule::FilterPaymentMethods, type: :model do
+RSpec.describe TagRule::FilterPaymentMethods, type: :model do
   let!(:tag_rule) { build_stubbed(:filter_payment_methods_tag_rule) }
 
   describe "determining whether tags match for a given payment method" do
diff --git a/spec/models/tag_rule/filter_products_spec.rb b/spec/models/tag_rule/filter_products_spec.rb
index f0a8bcc31b..ae844564c3 100644
--- a/spec/models/tag_rule/filter_products_spec.rb
+++ b/spec/models/tag_rule/filter_products_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagRule::FilterProducts, type: :model do
+RSpec.describe TagRule::FilterProducts, type: :model do
   let!(:tag_rule) { build_stubbed(:filter_products_tag_rule) }
 
   describe "determining whether tags match for a given variant" do
diff --git a/spec/models/tag_rule/filter_shipping_methods_spec.rb b/spec/models/tag_rule/filter_shipping_methods_spec.rb
index 3a6b410b60..7276059b8e 100644
--- a/spec/models/tag_rule/filter_shipping_methods_spec.rb
+++ b/spec/models/tag_rule/filter_shipping_methods_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagRule::FilterShippingMethods, type: :model do
+RSpec.describe TagRule::FilterShippingMethods, type: :model do
   let!(:tag_rule) { build_stubbed(:filter_shipping_methods_tag_rule) }
 
   describe "determining whether tags match for a given shipping method" do
diff --git a/spec/models/tag_rule_spec.rb b/spec/models/tag_rule_spec.rb
index 86eed9d14b..16e2c78ff8 100644
--- a/spec/models/tag_rule_spec.rb
+++ b/spec/models/tag_rule_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagRule, type: :model do
+RSpec.describe TagRule, type: :model do
   describe "validations" do
     it "requires a enterprise" do
       expect(subject).to validate_presence_of(:enterprise)
diff --git a/spec/models/terms_of_service_file_spec.rb b/spec/models/terms_of_service_file_spec.rb
index 19d9fb183d..f25c0adf2a 100644
--- a/spec/models/terms_of_service_file_spec.rb
+++ b/spec/models/terms_of_service_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TermsOfServiceFile do
+RSpec.describe TermsOfServiceFile do
   include FileHelper
 
   let(:upload) { terms_pdf_file }
diff --git a/spec/models/variant_override_spec.rb b/spec/models/variant_override_spec.rb
index 2da715f80a..15c9a1f4bf 100644
--- a/spec/models/variant_override_spec.rb
+++ b/spec/models/variant_override_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VariantOverride do
+RSpec.describe VariantOverride do
   let(:variant) { create(:variant) }
   let(:hub)     { create(:distributor_enterprise) }
 
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index aef0db2194..6af5c6b5bd 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -7,7 +7,7 @@ module Vouchers
   class TestVoucher < Voucher; end
 end
 
-describe Voucher do
+RSpec.describe Voucher do
   let(:enterprise) { build(:enterprise) }
 
   describe 'associations' do
diff --git a/spec/models/vouchers/flat_rate_spec.rb b/spec/models/vouchers/flat_rate_spec.rb
index 419a103534..9294784746 100644
--- a/spec/models/vouchers/flat_rate_spec.rb
+++ b/spec/models/vouchers/flat_rate_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Vouchers::FlatRate do
+RSpec.describe Vouchers::FlatRate do
   describe 'validations' do
     subject { build(:voucher_flat_rate) }
 
diff --git a/spec/models/vouchers/percentage_rate_spec.rb b/spec/models/vouchers/percentage_rate_spec.rb
index e2e136bd14..b172baf016 100644
--- a/spec/models/vouchers/percentage_rate_spec.rb
+++ b/spec/models/vouchers/percentage_rate_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Vouchers::PercentageRate do
+RSpec.describe Vouchers::PercentageRate do
   describe 'validations' do
     subject { build(:voucher_percentage_rate) }
 
diff --git a/spec/models/webhook_endpoint_spec.rb b/spec/models/webhook_endpoint_spec.rb
index 5f1d630f09..0150037a3f 100644
--- a/spec/models/webhook_endpoint_spec.rb
+++ b/spec/models/webhook_endpoint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe WebhookEndpoint, type: :model do
+RSpec.describe WebhookEndpoint, type: :model do
   describe "validations" do
     it { is_expected.to validate_presence_of(:url) }
   end
diff --git a/spec/queries/batch_taggable_tags_query_spec.rb b/spec/queries/batch_taggable_tags_query_spec.rb
index 2bb63926ea..991ce00258 100644
--- a/spec/queries/batch_taggable_tags_query_spec.rb
+++ b/spec/queries/batch_taggable_tags_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BatchTaggableTagsQuery do
+RSpec.describe BatchTaggableTagsQuery do
   it "fetches tags for multiple models in one query" do
     customer_i = create(:customer, tag_list: "member,volunteer")
     customer_ii = create(:customer, tag_list: "member")
diff --git a/spec/queries/complete_orders_with_balance_query_spec.rb b/spec/queries/complete_orders_with_balance_query_spec.rb
index 0f7e856865..1f788669e1 100644
--- a/spec/queries/complete_orders_with_balance_query_spec.rb
+++ b/spec/queries/complete_orders_with_balance_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CompleteOrdersWithBalanceQuery do
+RSpec.describe CompleteOrdersWithBalanceQuery do
   subject(:result) { described_class.new(user).call }
 
   describe '#call' do
diff --git a/spec/queries/complete_visible_orders_query_spec.rb b/spec/queries/complete_visible_orders_query_spec.rb
index af7d54872f..a39de73bdf 100644
--- a/spec/queries/complete_visible_orders_query_spec.rb
+++ b/spec/queries/complete_visible_orders_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CompleteVisibleOrdersQuery do
+RSpec.describe CompleteVisibleOrdersQuery do
   subject(:result) { described_class.new(order_permissions).call }
 
   let(:filter_canceled) { false }
diff --git a/spec/queries/customers_with_balance_query_spec.rb b/spec/queries/customers_with_balance_query_spec.rb
index 47811e21ce..a71adb7479 100644
--- a/spec/queries/customers_with_balance_query_spec.rb
+++ b/spec/queries/customers_with_balance_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CustomersWithBalanceQuery do
+RSpec.describe CustomersWithBalanceQuery do
   subject(:result) { described_class.new(Customer.where(id: customers)).call }
 
   describe '#call' do
diff --git a/spec/queries/outstanding_balance_query_spec.rb b/spec/queries/outstanding_balance_query_spec.rb
index 77e9acb307..a79b209da0 100644
--- a/spec/queries/outstanding_balance_query_spec.rb
+++ b/spec/queries/outstanding_balance_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OutstandingBalanceQuery do
+RSpec.describe OutstandingBalanceQuery do
   subject(:query) { described_class.new(relation) }
 
   let(:result) { query.call }
diff --git a/spec/queries/payments_requiring_action_query_spec.rb b/spec/queries/payments_requiring_action_query_spec.rb
index 4101a181ca..d18a861802 100644
--- a/spec/queries/payments_requiring_action_query_spec.rb
+++ b/spec/queries/payments_requiring_action_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PaymentsRequiringActionQuery do
+RSpec.describe PaymentsRequiringActionQuery do
   subject(:result) { described_class.new(user).call }
 
   let(:user) { create(:user) }
diff --git a/spec/queries/product_scope_query_spec.rb b/spec/queries/product_scope_query_spec.rb
index 9674a201f5..197ec23aad 100755
--- a/spec/queries/product_scope_query_spec.rb
+++ b/spec/queries/product_scope_query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductScopeQuery do
+RSpec.describe ProductScopeQuery do
   let!(:taxon) { create(:taxon) }
   let(:supplier) { create(:supplier_enterprise) }
   let(:supplier2) { create(:supplier_enterprise) }
diff --git a/spec/reflexes/products_reflex_spec.rb b/spec/reflexes/products_reflex_spec.rb
index 97bf617161..7f71e8e26d 100644
--- a/spec/reflexes/products_reflex_spec.rb
+++ b/spec/reflexes/products_reflex_spec.rb
@@ -2,7 +2,7 @@
 
 require "reflex_helper"
 
-describe ProductsReflex, type: :reflex, feature: :admin_style_v3 do
+RSpec.describe ProductsReflex, type: :reflex, feature: :admin_style_v3 do
   let(:current_user) { create(:admin_user) } # todo: set up an enterprise user to test permissions
   let(:context) {
     { url: admin_products_url, connection: { current_user: } }
diff --git a/spec/reflexes/user_reflex_spec.rb b/spec/reflexes/user_reflex_spec.rb
index 815557208f..36fba0c599 100644
--- a/spec/reflexes/user_reflex_spec.rb
+++ b/spec/reflexes/user_reflex_spec.rb
@@ -2,7 +2,7 @@
 
 require "reflex_helper"
 
-describe UserReflex, type: :reflex do
+RSpec.describe UserReflex, type: :reflex do
   let(:current_user) { create(:user) }
   let(:context) { { url: spree.admin_dashboard_url, connection: { current_user: } } }
 
diff --git a/spec/requests/admin/images_spec.rb b/spec/requests/admin/images_spec.rb
index 11d3659482..e7c9584037 100644
--- a/spec/requests/admin/images_spec.rb
+++ b/spec/requests/admin/images_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "/admin/products/:product_id/images", type: :request do
+RSpec.describe "/admin/products/:product_id/images", type: :request do
   include AuthenticationHelper
 
   let!(:product) { create(:product) }
diff --git a/spec/requests/admin/product_import_spec.rb b/spec/requests/admin/product_import_spec.rb
index 3075457f40..b3c968748d 100644
--- a/spec/requests/admin/product_import_spec.rb
+++ b/spec/requests/admin/product_import_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Product Import", type: :request do
+RSpec.describe "Product Import", type: :request do
   include AuthenticationHelper
 
   describe "validate_data" do
diff --git a/spec/requests/admin/vouchers_spec.rb b/spec/requests/admin/vouchers_spec.rb
index fdb9213d3e..64c16ef7ff 100644
--- a/spec/requests/admin/vouchers_spec.rb
+++ b/spec/requests/admin/vouchers_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "/admin/enterprises/:enterprise_id/vouchers", type: :request do
+RSpec.describe "/admin/enterprises/:enterprise_id/vouchers", type: :request do
   let(:enterprise) { create(:supplier_enterprise, name: "Feedme") }
   let(:enterprise_user) { create(:user, enterprise_limit: 1) }
 
diff --git a/spec/requests/api/orders_spec.rb b/spec/requests/api/orders_spec.rb
index 20ea82c530..433be2681b 100644
--- a/spec/requests/api/orders_spec.rb
+++ b/spec/requests/api/orders_spec.rb
@@ -2,7 +2,7 @@
 
 require 'swagger_helper'
 
-describe 'api/v0/orders', swagger_doc: 'v0.yaml', type: :request do
+RSpec.describe 'api/v0/orders', swagger_doc: 'v0.yaml', type: :request do
   path '/api/v0/orders' do
     get('list orders') do
       tags 'Orders'
diff --git a/spec/requests/api/routes_spec.rb b/spec/requests/api/routes_spec.rb
index fa7d1b20bc..d3ab40d792 100644
--- a/spec/requests/api/routes_spec.rb
+++ b/spec/requests/api/routes_spec.rb
@@ -3,7 +3,7 @@
 # test a single endpoint to make sure the redirects are working as intended.
 require 'spec_helper'
 
-describe 'Orders Cycles endpoint', type: :request do
+RSpec.describe 'Orders Cycles endpoint', type: :request do
   let(:distributor) { create(:distributor_enterprise) }
   let(:order_cycle) { create(:order_cycle, distributors: [distributor]) }
 
diff --git a/spec/requests/api/v1/customers_spec.rb b/spec/requests/api/v1/customers_spec.rb
index 1ca08263fe..1259e99e03 100644
--- a/spec/requests/api/v1/customers_spec.rb
+++ b/spec/requests/api/v1/customers_spec.rb
@@ -2,7 +2,7 @@
 
 require "swagger_helper"
 
-describe "Customers", type: :request, swagger_doc: "v1.yaml", feature: :api_v1 do
+RSpec.describe "Customers", type: :request, swagger_doc: "v1.yaml", feature: :api_v1 do
   let!(:enterprise1) { create(:enterprise, name: "The Farm") }
   let!(:enterprise2) { create(:enterprise) }
   let!(:enterprise3) { create(:enterprise) }
diff --git a/spec/requests/api_docs_spec.rb b/spec/requests/api_docs_spec.rb
index 8b5ce15933..f2d8fb5ab6 100644
--- a/spec/requests/api_docs_spec.rb
+++ b/spec/requests/api_docs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "API documentation", type: :request do
+RSpec.describe "API documentation", type: :request do
   it "shows the OFN API v1" do
     get rswag_ui_path
     expect(response).to redirect_to "/api-docs/index.html"
diff --git a/spec/requests/checkout/failed_checkout_spec.rb b/spec/requests/checkout/failed_checkout_spec.rb
index fdde8cb297..f7a767f630 100644
--- a/spec/requests/checkout/failed_checkout_spec.rb
+++ b/spec/requests/checkout/failed_checkout_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "checking out an order that initially fails", type: :request do
+RSpec.describe "checking out an order that initially fails", type: :request do
   include ShopWorkflow
 
   let!(:shop) { create(:enterprise) }
diff --git a/spec/requests/checkout/paypal_spec.rb b/spec/requests/checkout/paypal_spec.rb
index 5fd39d621a..a32562835e 100644
--- a/spec/requests/checkout/paypal_spec.rb
+++ b/spec/requests/checkout/paypal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "checking out an order with a paypal express payment method", type: :request do
+RSpec.describe "checking out an order with a paypal express payment method", type: :request do
   include ShopWorkflow
   include PaypalHelper
 
diff --git a/spec/requests/checkout/routes_spec.rb b/spec/requests/checkout/routes_spec.rb
index 0f1b518b8d..55fe054662 100644
--- a/spec/requests/checkout/routes_spec.rb
+++ b/spec/requests/checkout/routes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'checkout endpoints', type: :request do
+RSpec.describe 'checkout endpoints', type: :request do
   include ShopWorkflow
 
   let!(:shop) { create(:enterprise) }
diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb
index 8c5c48a363..5640c49146 100644
--- a/spec/requests/checkout/stripe_sca_spec.rb
+++ b/spec/requests/checkout/stripe_sca_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "checking out an order with a Stripe SCA payment method", type: :request do
+RSpec.describe "checking out an order with a Stripe SCA payment method", type: :request do
   include ShopWorkflow
   include AuthenticationHelper
   include OpenFoodNetwork::ApiHelper
diff --git a/spec/requests/home_controller_spec.rb b/spec/requests/home_controller_spec.rb
index 9400fedcd9..3453d30932 100644
--- a/spec/requests/home_controller_spec.rb
+++ b/spec/requests/home_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HomeController, type: :request do
+RSpec.describe HomeController, type: :request do
   context "#unauthorized" do
     it "renders the unauthorized template" do
       get "/unauthorized"
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 0bf3147ea2..aef5ef69d6 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # Devise calls OmniauthCallbacksController for OpenID Connect callbacks.
-describe '/user/spree_user/auth/openid_connect/callback', type: :request do
+RSpec.describe '/user/spree_user/auth/openid_connect/callback', type: :request do
   include AuthenticationHelper
 
   let(:user) { create(:user) }
diff --git a/spec/requests/payments_controller_spec.rb b/spec/requests/payments_controller_spec.rb
index 5201b53b86..9aab1272eb 100644
--- a/spec/requests/payments_controller_spec.rb
+++ b/spec/requests/payments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "/payments/:id/authorize" do
+RSpec.describe "/payments/:id/authorize" do
   let!(:user) { create(:user) }
   let!(:order) { create(:order, user:) }
   let!(:payment) { create(:payment, order:) }
diff --git a/spec/requests/spree/admin/overview_spec.rb b/spec/requests/spree/admin/overview_spec.rb
index 4fc00f5563..4d5739f88c 100644
--- a/spec/requests/spree/admin/overview_spec.rb
+++ b/spec/requests/spree/admin/overview_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "/admin", type: :request do
+RSpec.describe "/admin", type: :request do
   let(:enterprise) { create(:supplier_enterprise, name: "Feedme") }
   let(:enterprise_user) { create(:user, enterprise_limit: 1) }
 
diff --git a/spec/requests/spree/admin/payments_spec.rb b/spec/requests/spree/admin/payments_spec.rb
index c8ff325554..18a2a4f75c 100644
--- a/spec/requests/spree/admin/payments_spec.rb
+++ b/spec/requests/spree/admin/payments_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Spree::Admin::PaymentsController, type: :request do
+RSpec.describe Spree::Admin::PaymentsController, type: :request do
   let(:user) { order.user }
   let(:order) { create(:completed_order_with_fees) }
 
diff --git a/spec/requests/voucher_adjustments_spec.rb b/spec/requests/voucher_adjustments_spec.rb
index 56af4db442..78ae9c29d5 100644
--- a/spec/requests/voucher_adjustments_spec.rb
+++ b/spec/requests/voucher_adjustments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VoucherAdjustmentsController, type: :request do
+RSpec.describe VoucherAdjustmentsController, type: :request do
   let(:user) { order.user }
   let(:address) { create(:address) }
   let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
diff --git a/spec/routing/stripe_spec.rb b/spec/routing/stripe_spec.rb
index b4f5c4b7d7..f9b0403233 100644
--- a/spec/routing/stripe_spec.rb
+++ b/spec/routing/stripe_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "routing for Stripe return URLS", type: :routing do
+RSpec.describe "routing for Stripe return URLS", type: :routing do
   context "checkout return URLs" do
     it "routes /checkout to checkout#edit" do
       expect(get: "checkout").
diff --git a/spec/serializers/api/admin/customer_serializer_spec.rb b/spec/serializers/api/admin/customer_serializer_spec.rb
index ff241857af..999c8015f1 100644
--- a/spec/serializers/api/admin/customer_serializer_spec.rb
+++ b/spec/serializers/api/admin/customer_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::Admin::CustomerSerializer do
+RSpec.describe Api::Admin::CustomerSerializer do
   let(:tag_list) { ["one", "two", "three"] }
   let(:customer) { create(:customer, tag_list:) }
   let!(:tag_rule) {
diff --git a/spec/serializers/api/admin/customer_with_balance_serializer_spec.rb b/spec/serializers/api/admin/customer_with_balance_serializer_spec.rb
index 5c0c3f1df5..53e9c4490b 100644
--- a/spec/serializers/api/admin/customer_with_balance_serializer_spec.rb
+++ b/spec/serializers/api/admin/customer_with_balance_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::Admin::CustomerWithBalanceSerializer do
+RSpec.describe Api::Admin::CustomerWithBalanceSerializer do
   let(:serialized_customer) { described_class.new(customer) }
 
   describe '#balance' do
diff --git a/spec/serializers/api/admin/enterprise_serializer_spec.rb b/spec/serializers/api/admin/enterprise_serializer_spec.rb
index 7c588bee1c..3f20145771 100644
--- a/spec/serializers/api/admin/enterprise_serializer_spec.rb
+++ b/spec/serializers/api/admin/enterprise_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::Admin::EnterpriseSerializer do
+RSpec.describe Api::Admin::EnterpriseSerializer do
   include FileHelper
 
   let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/serializers/api/admin/exchange_serializer_spec.rb b/spec/serializers/api/admin/exchange_serializer_spec.rb
index 5f12b44cd5..05915d7823 100644
--- a/spec/serializers/api/admin/exchange_serializer_spec.rb
+++ b/spec/serializers/api/admin/exchange_serializer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
-describe Api::Admin::ExchangeSerializer do
+RSpec.describe Api::Admin::ExchangeSerializer do
   let(:v1) { create(:variant) }
   let(:v2) { create(:variant) }
   let(:v3) { create(:variant) }
diff --git a/spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb b/spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb
index f37eb83f09..8cd6cd560d 100644
--- a/spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb
+++ b/spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::Admin::ForOrderCycle::SuppliedProductSerializer do
+RSpec.describe Api::Admin::ForOrderCycle::SuppliedProductSerializer do
   let(:coordinator)         { create(:distributor_enterprise) }
   let(:order_cycle)         { double(:order_cycle, coordinator:) }
   let!(:product) { create(:simple_product) }
diff --git a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
index e16a66a235..810fbf951b 100644
--- a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
+++ b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::Admin::IndexEnterpriseSerializer do
+RSpec.describe Api::Admin::IndexEnterpriseSerializer do
   let(:enterprise) { create(:distributor_enterprise) }
   context "when spree_current_user is a manager" do
     let(:user) { create(:user) }
diff --git a/spec/serializers/api/admin/order_cycle_serializer_spec.rb b/spec/serializers/api/admin/order_cycle_serializer_spec.rb
index e04e362dc1..b05bf9816e 100644
--- a/spec/serializers/api/admin/order_cycle_serializer_spec.rb
+++ b/spec/serializers/api/admin/order_cycle_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::Admin::OrderCycleSerializer do
+RSpec.describe Api::Admin::OrderCycleSerializer do
   let(:order_cycle) { create(:order_cycle) }
   let(:serializer) {
     Api::Admin::OrderCycleSerializer.new order_cycle,
diff --git a/spec/serializers/api/admin/order_serializer_spec.rb b/spec/serializers/api/admin/order_serializer_spec.rb
index f1f16665c5..580a5ae2b1 100644
--- a/spec/serializers/api/admin/order_serializer_spec.rb
+++ b/spec/serializers/api/admin/order_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Api::Admin::OrderSerializer do
+RSpec.describe Api::Admin::OrderSerializer do
   let(:serializer) { described_class.new order }
   let(:order) { build(:order) }
 
diff --git a/spec/serializers/api/admin/product_serializer_spec.rb b/spec/serializers/api/admin/product_serializer_spec.rb
index 7e42a78197..d2c0f25577 100644
--- a/spec/serializers/api/admin/product_serializer_spec.rb
+++ b/spec/serializers/api/admin/product_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::Admin::ProductSerializer do
+RSpec.describe Api::Admin::ProductSerializer do
   let(:product) { create(:simple_product) }
   let(:serializer) { described_class.new(product) }
 
diff --git a/spec/serializers/api/admin/subscription_customer_serializer_spec.rb b/spec/serializers/api/admin/subscription_customer_serializer_spec.rb
index ef25c845c0..fd1927c4ef 100644
--- a/spec/serializers/api/admin/subscription_customer_serializer_spec.rb
+++ b/spec/serializers/api/admin/subscription_customer_serializer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/address_finder'
 
-describe Api::Admin::SubscriptionCustomerSerializer do
+RSpec.describe Api::Admin::SubscriptionCustomerSerializer do
   let(:address) { build(:address) }
   let(:customer) { build(:customer) }
   let(:serializer) { Api::Admin::SubscriptionCustomerSerializer.new(customer) }
diff --git a/spec/serializers/api/admin/subscription_line_item_serializer_spec.rb b/spec/serializers/api/admin/subscription_line_item_serializer_spec.rb
index 9b1ca21818..79acfced05 100644
--- a/spec/serializers/api/admin/subscription_line_item_serializer_spec.rb
+++ b/spec/serializers/api/admin/subscription_line_item_serializer_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Api
   module Admin
-    describe SubscriptionLineItemSerializer do
+    RSpec.describe SubscriptionLineItemSerializer do
       let(:subscription_line_item) { create(:subscription_line_item) }
 
       it "serializes a subscription line item with the product name" do
diff --git a/spec/serializers/api/admin/variant_override_serializer_spec.rb b/spec/serializers/api/admin/variant_override_serializer_spec.rb
index e282ea0175..9cc1799ee1 100644
--- a/spec/serializers/api/admin/variant_override_serializer_spec.rb
+++ b/spec/serializers/api/admin/variant_override_serializer_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Api::Admin::VariantOverrideSerializer do
+RSpec.describe Api::Admin::VariantOverrideSerializer do
   let(:variant) { create(:variant) }
   let(:hub) { create(:distributor_enterprise) }
   let(:price) { 77.77 }
diff --git a/spec/serializers/api/admin/variant_serializer_spec.rb b/spec/serializers/api/admin/variant_serializer_spec.rb
index 957930bad8..7c496d721d 100644
--- a/spec/serializers/api/admin/variant_serializer_spec.rb
+++ b/spec/serializers/api/admin/variant_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::Admin::VariantSerializer do
+RSpec.describe Api::Admin::VariantSerializer do
   let(:variant) { create(:variant) }
 
   it "serializes the variant name" do
diff --git a/spec/serializers/api/cached_enterprise_serializer_spec.rb b/spec/serializers/api/cached_enterprise_serializer_spec.rb
index 9517b31a80..584d365e73 100644
--- a/spec/serializers/api/cached_enterprise_serializer_spec.rb
+++ b/spec/serializers/api/cached_enterprise_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::CachedEnterpriseSerializer do
+RSpec.describe Api::CachedEnterpriseSerializer do
   let(:cached_enterprise_serializer) { described_class.new(enterprise) }
   let(:enterprise) { create(:enterprise) }
 
diff --git a/spec/serializers/api/credit_card_serializer_spec.rb b/spec/serializers/api/credit_card_serializer_spec.rb
index c8b2e3c3c1..f23160d9cf 100644
--- a/spec/serializers/api/credit_card_serializer_spec.rb
+++ b/spec/serializers/api/credit_card_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::CreditCardSerializer do
+RSpec.describe Api::CreditCardSerializer do
   let(:card) { create(:credit_card) }
   let(:serializer) { Api::CreditCardSerializer.new card }
 
diff --git a/spec/serializers/api/current_order_serializer_spec.rb b/spec/serializers/api/current_order_serializer_spec.rb
index 6317477a0f..255885c330 100644
--- a/spec/serializers/api/current_order_serializer_spec.rb
+++ b/spec/serializers/api/current_order_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::CurrentOrderSerializer do
+RSpec.describe Api::CurrentOrderSerializer do
   let(:distributor) { build(:distributor_enterprise) }
   let(:order_cycle) { build(:simple_order_cycle) }
   let(:line_item) { build(:line_item, variant: create(:variant)) }
diff --git a/spec/serializers/api/enterprise_serializer_spec.rb b/spec/serializers/api/enterprise_serializer_spec.rb
index 970c8f63d3..0eb7d47abd 100644
--- a/spec/serializers/api/enterprise_serializer_spec.rb
+++ b/spec/serializers/api/enterprise_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::EnterpriseSerializer do
+RSpec.describe Api::EnterpriseSerializer do
   let(:serializer) { Api::EnterpriseSerializer.new enterprise, data: }
   let(:enterprise) { create(:distributor_enterprise, is_primary_producer: true) }
   let(:taxon) { create(:taxon) }
diff --git a/spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb b/spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb
index 964c52e295..47462ccbed 100644
--- a/spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb
+++ b/spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::EnterpriseShopfrontListSerializer do
+RSpec.describe Api::EnterpriseShopfrontListSerializer do
   let(:enterprise) { create(:distributor_enterprise) }
   let(:serializer) {
     Api::EnterpriseShopfrontListSerializer.new enterprise
diff --git a/spec/serializers/api/enterprise_shopfront_serializer_spec.rb b/spec/serializers/api/enterprise_shopfront_serializer_spec.rb
index 8d85719483..766995c793 100644
--- a/spec/serializers/api/enterprise_shopfront_serializer_spec.rb
+++ b/spec/serializers/api/enterprise_shopfront_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::EnterpriseShopfrontSerializer do
+RSpec.describe Api::EnterpriseShopfrontSerializer do
   let!(:hub) { create(:distributor_enterprise, with_payment_and_shipping: true) }
   let!(:producer) { create(:supplier_enterprise) }
   let!(:producer_hidden) { create(:supplier_enterprise_hidden) }
diff --git a/spec/serializers/api/group_list_serializer_spec.rb b/spec/serializers/api/group_list_serializer_spec.rb
index 69f10a6360..5dff7def23 100644
--- a/spec/serializers/api/group_list_serializer_spec.rb
+++ b/spec/serializers/api/group_list_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::GroupListSerializer do
+RSpec.describe Api::GroupListSerializer do
   let!(:group) { create(:enterprise_group) }
   let!(:producer) { create(:supplier_enterprise) }
 
diff --git a/spec/serializers/api/order_cycle_serializer_spec.rb b/spec/serializers/api/order_cycle_serializer_spec.rb
index 5b0a199d11..af316624d7 100644
--- a/spec/serializers/api/order_cycle_serializer_spec.rb
+++ b/spec/serializers/api/order_cycle_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::OrderCycleSerializer do
+RSpec.describe Api::OrderCycleSerializer do
   let(:order_cycle) { create(:simple_order_cycle) }
   let(:serializer) { Api::OrderCycleSerializer.new(order_cycle).to_json }
 
diff --git a/spec/serializers/api/order_serializer_spec.rb b/spec/serializers/api/order_serializer_spec.rb
index 521c3fa4f7..dde0126514 100644
--- a/spec/serializers/api/order_serializer_spec.rb
+++ b/spec/serializers/api/order_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::OrderSerializer do
+RSpec.describe Api::OrderSerializer do
   let(:serializer) { Api::OrderSerializer.new order }
   let(:order) { create(:completed_order_with_totals) }
 
diff --git a/spec/serializers/api/product_serializer_spec.rb b/spec/serializers/api/product_serializer_spec.rb
index d44e964665..af0b1f3bf4 100644
--- a/spec/serializers/api/product_serializer_spec.rb
+++ b/spec/serializers/api/product_serializer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'open_food_network/enterprise_fee_calculator'
 
-describe Api::ProductSerializer do
+RSpec.describe Api::ProductSerializer do
   include ShopWorkflow
 
   let!(:distributor) { create(:distributor_enterprise) }
diff --git a/spec/serializers/api/shipping_method_serializer_spec.rb b/spec/serializers/api/shipping_method_serializer_spec.rb
index e112f97310..a24665052e 100644
--- a/spec/serializers/api/shipping_method_serializer_spec.rb
+++ b/spec/serializers/api/shipping_method_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::ShippingMethodSerializer do
+RSpec.describe Api::ShippingMethodSerializer do
   let(:shipping_method) { create(:shipping_method) }
 
   it "serializes a test shipping_method" do
diff --git a/spec/serializers/api/variant_serializer_spec.rb b/spec/serializers/api/variant_serializer_spec.rb
index e4d2cfae3d..b8e50edad7 100644
--- a/spec/serializers/api/variant_serializer_spec.rb
+++ b/spec/serializers/api/variant_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Api::VariantSerializer do
+RSpec.describe Api::VariantSerializer do
   subject { Api::VariantSerializer.new variant }
   let(:variant) { create(:variant) }
 
diff --git a/spec/services/address_geocoder_spec.rb b/spec/services/address_geocoder_spec.rb
index 1215c95e1b..5865275521 100644
--- a/spec/services/address_geocoder_spec.rb
+++ b/spec/services/address_geocoder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AddressGeocoder do
+RSpec.describe AddressGeocoder do
   let(:australia) { Spree::Country.find_or_create_by!(name: "Australia") }
   let(:victoria) { Spree::State.find_or_create_by(name: "Victoria", country: australia) }
   let(:address) do
diff --git a/spec/services/cache_service_spec.rb b/spec/services/cache_service_spec.rb
index c82a1aeaf2..526f211bfd 100644
--- a/spec/services/cache_service_spec.rb
+++ b/spec/services/cache_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CacheService do
+RSpec.describe CacheService do
   let(:rails_cache) { Rails.cache }
 
   describe "#cache" do
diff --git a/spec/services/cap_quantity_spec.rb b/spec/services/cap_quantity_spec.rb
index 754a10f1c1..3f97f117dc 100644
--- a/spec/services/cap_quantity_spec.rb
+++ b/spec/services/cap_quantity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CapQuantity do
+RSpec.describe CapQuantity do
   describe "checking that line items are available to purchase" do
     let(:order_cycle) { create(:simple_order_cycle) }
     let(:shop) { order_cycle.coordinator }
diff --git a/spec/services/cart_service_spec.rb b/spec/services/cart_service_spec.rb
index ea5b1dc731..13b70a2bd7 100644
--- a/spec/services/cart_service_spec.rb
+++ b/spec/services/cart_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CartService do
+RSpec.describe CartService do
   let(:order) { double(:order, id: 123) }
   let(:currency) { "EUR" }
   let(:params) { {} }
diff --git a/spec/services/checkout/payment_method_fetcher_spec.rb b/spec/services/checkout/payment_method_fetcher_spec.rb
index 9f0c23aa89..b3f941b0e4 100644
--- a/spec/services/checkout/payment_method_fetcher_spec.rb
+++ b/spec/services/checkout/payment_method_fetcher_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Checkout::PaymentMethodFetcher do
+RSpec.describe Checkout::PaymentMethodFetcher do
   let!(:order) { create(:completed_order_with_totals) }
   let(:payment1) { build(:payment, order:) }
   let(:payment2) { build(:payment, order:) }
diff --git a/spec/services/checkout/post_checkout_actions_spec.rb b/spec/services/checkout/post_checkout_actions_spec.rb
index 765b84e541..30b4936eaa 100644
--- a/spec/services/checkout/post_checkout_actions_spec.rb
+++ b/spec/services/checkout/post_checkout_actions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Checkout::PostCheckoutActions do
+RSpec.describe Checkout::PostCheckoutActions do
   let(:order) { create(:order_with_distributor) }
   let(:postCheckoutActions) { Checkout::PostCheckoutActions.new(order) }
 
diff --git a/spec/services/checkout/stripe_redirect_spec.rb b/spec/services/checkout/stripe_redirect_spec.rb
index a2d547e886..9798958994 100644
--- a/spec/services/checkout/stripe_redirect_spec.rb
+++ b/spec/services/checkout/stripe_redirect_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Checkout::StripeRedirect do
+RSpec.describe Checkout::StripeRedirect do
   describe '#path' do
     let(:order) { create(:order) }
     let(:service) { Checkout::StripeRedirect.new(payment_method, order) }
diff --git a/spec/services/content_sanitizer_spec.rb b/spec/services/content_sanitizer_spec.rb
index 1773c5c9fb..63b6a15478 100644
--- a/spec/services/content_sanitizer_spec.rb
+++ b/spec/services/content_sanitizer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContentSanitizer do
+RSpec.describe ContentSanitizer do
   let(:service) { described_class.new }
 
   context "#strip_content" do
diff --git a/spec/services/default_shipping_category_spec.rb b/spec/services/default_shipping_category_spec.rb
index c2032715df..12d8488181 100644
--- a/spec/services/default_shipping_category_spec.rb
+++ b/spec/services/default_shipping_category_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DefaultShippingCategory do
+RSpec.describe DefaultShippingCategory do
   describe '.create!' do
     it "names the location 'Default'" do
       shipping_category = described_class.create!
diff --git a/spec/services/default_stock_location_spec.rb b/spec/services/default_stock_location_spec.rb
index d73ef912cf..93b0a053f7 100644
--- a/spec/services/default_stock_location_spec.rb
+++ b/spec/services/default_stock_location_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DefaultStockLocation do
+RSpec.describe DefaultStockLocation do
   describe '.find_or_create' do
     context 'when a location named default already exists' do
       let!(:location) do
diff --git a/spec/services/embedded_page_service_spec.rb b/spec/services/embedded_page_service_spec.rb
index 54102f4321..6f201f625b 100644
--- a/spec/services/embedded_page_service_spec.rb
+++ b/spec/services/embedded_page_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EmbeddedPageService do
+RSpec.describe EmbeddedPageService do
   let(:enterprise_slug) { 'test-enterprise' }
   let(:params) {
     { controller: 'enterprises', action: 'shop', id: enterprise_slug, embedded_shopfront: true }
diff --git a/spec/services/exchange_products_renderer_spec.rb b/spec/services/exchange_products_renderer_spec.rb
index 2c7863c013..df0e482edc 100644
--- a/spec/services/exchange_products_renderer_spec.rb
+++ b/spec/services/exchange_products_renderer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe ExchangeProductsRenderer do
+RSpec.describe ExchangeProductsRenderer do
   let(:order_cycle) { create(:order_cycle) }
   let(:coordinator) { order_cycle.coordinator }
   let(:renderer) { described_class.new(order_cycle, coordinator.owner) }
diff --git a/spec/services/exchange_variant_bulk_updater_spec.rb b/spec/services/exchange_variant_bulk_updater_spec.rb
index ebe6a408fe..880f097548 100644
--- a/spec/services/exchange_variant_bulk_updater_spec.rb
+++ b/spec/services/exchange_variant_bulk_updater_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ExchangeVariantBulkUpdater do
+RSpec.describe ExchangeVariantBulkUpdater do
   let!(:first_variant) { create(:variant) }
   let!(:second_variant) { create(:variant) }
   let!(:third_variant) { create(:variant) }
diff --git a/spec/services/file_path_sanitizer_spec.rb b/spec/services/file_path_sanitizer_spec.rb
index 4a47c2c1b2..9dd4fc1581 100644
--- a/spec/services/file_path_sanitizer_spec.rb
+++ b/spec/services/file_path_sanitizer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FilePathSanitizer do
+RSpec.describe FilePathSanitizer do
   let(:folder_path){ '/tmp/product_import123' }
   let(:file_path) { "#{folder_path}/import.csv" }
 
diff --git a/spec/services/image_importer_spec.rb b/spec/services/image_importer_spec.rb
index b00796b25a..df526750ca 100644
--- a/spec/services/image_importer_spec.rb
+++ b/spec/services/image_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ImageImporter do
+RSpec.describe ImageImporter do
   let(:url) { Rails.root.join("spec/fixtures/files/logo.png").to_s }
   let(:product) { create(:product) }
 
diff --git a/spec/services/invoice_data_generator_spec.rb b/spec/services/invoice_data_generator_spec.rb
index 1099482a9f..917b3557a8 100644
--- a/spec/services/invoice_data_generator_spec.rb
+++ b/spec/services/invoice_data_generator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InvoiceDataGenerator do
+RSpec.describe InvoiceDataGenerator do
   describe '#generate' do
     let!(:order) { create(:completed_order_with_fees) }
     let!(:invoice_data_generator){ InvoiceDataGenerator.new(order) }
diff --git a/spec/services/invoice_renderer_spec.rb b/spec/services/invoice_renderer_spec.rb
index cbad391a0f..e732aa3b5d 100644
--- a/spec/services/invoice_renderer_spec.rb
+++ b/spec/services/invoice_renderer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InvoiceRenderer do
+RSpec.describe InvoiceRenderer do
   include Spree::PaymentMethodsHelper
 
   let(:service) { described_class.new }
diff --git a/spec/services/mail_configuration_spec.rb b/spec/services/mail_configuration_spec.rb
index f0f10a9c4b..c4b6b7068d 100644
--- a/spec/services/mail_configuration_spec.rb
+++ b/spec/services/mail_configuration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MailConfiguration do
+RSpec.describe MailConfiguration do
   describe 'apply!' do
     before do
       allow(Spree::Core::MailSettings).to receive(:init) { true }
diff --git a/spec/services/order_cycles/clone_service_spec.rb b/spec/services/order_cycles/clone_service_spec.rb
index 32525a5b73..a3b8b4d16f 100644
--- a/spec/services/order_cycles/clone_service_spec.rb
+++ b/spec/services/order_cycles/clone_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::CloneService do
+RSpec.describe OrderCycles::CloneService do
   describe "#create" do
     it "clones the order cycle" do
       coordinator = create(:enterprise);
diff --git a/spec/services/order_cycles/distributed_products_service_spec.rb b/spec/services/order_cycles/distributed_products_service_spec.rb
index 76a41be2d7..4427c48494 100644
--- a/spec/services/order_cycles/distributed_products_service_spec.rb
+++ b/spec/services/order_cycles/distributed_products_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::DistributedProductsService do
+RSpec.describe OrderCycles::DistributedProductsService do
   describe "#products_relation" do
     let(:distributor) { create(:distributor_enterprise) }
     let(:product) { create(:product) }
diff --git a/spec/services/order_cycles/distributed_variants_service_spec.rb b/spec/services/order_cycles/distributed_variants_service_spec.rb
index 6c5bde8aa1..d0abcf08f7 100644
--- a/spec/services/order_cycles/distributed_variants_service_spec.rb
+++ b/spec/services/order_cycles/distributed_variants_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::DistributedVariantsService do
+RSpec.describe OrderCycles::DistributedVariantsService do
   let(:order) { double(:order) }
   let(:distributor) { double(:distributor) }
   let(:order_cycle) { double(:order_cycle) }
diff --git a/spec/services/order_cycles/form_service_spec.rb b/spec/services/order_cycles/form_service_spec.rb
index 3f39ad5439..ca8c5e1b18 100644
--- a/spec/services/order_cycles/form_service_spec.rb
+++ b/spec/services/order_cycles/form_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::FormService do
+RSpec.describe OrderCycles::FormService do
   describe "save" do
     describe "creating a new order cycle from params" do
       let(:shop) { create(:enterprise) }
diff --git a/spec/services/order_cycles/warning_service_spec.rb b/spec/services/order_cycles/warning_service_spec.rb
index 1cb7e0bb9f..aad80e8721 100644
--- a/spec/services/order_cycles/warning_service_spec.rb
+++ b/spec/services/order_cycles/warning_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::WarningService do
+RSpec.describe OrderCycles::WarningService do
   let(:user) { create(:user) }
   let(:subject) { OrderCycles::WarningService }
   let!(:distributor) { create(:enterprise, owner: user) }
diff --git a/spec/services/order_cycles/webhook_service_spec.rb b/spec/services/order_cycles/webhook_service_spec.rb
index 060607b8f9..bdc77bb151 100644
--- a/spec/services/order_cycles/webhook_service_spec.rb
+++ b/spec/services/order_cycles/webhook_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OrderCycles::WebhookService do
+RSpec.describe OrderCycles::WebhookService do
   let(:order_cycle) {
     create(
       :simple_order_cycle,
diff --git a/spec/services/orders/available_payment_methods_service_spec.rb b/spec/services/orders/available_payment_methods_service_spec.rb
index b31d3af5f6..fc442f3748 100644
--- a/spec/services/orders/available_payment_methods_service_spec.rb
+++ b/spec/services/orders/available_payment_methods_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::AvailablePaymentMethodsService do
+RSpec.describe Orders::AvailablePaymentMethodsService do
   context "when the order has no current_distributor" do
     it "returns an empty array" do
       order_cycle = create(:sells_own_order_cycle)
diff --git a/spec/services/orders/available_shipping_methods_service_spec.rb b/spec/services/orders/available_shipping_methods_service_spec.rb
index 9ee26ca804..639ff8d0df 100644
--- a/spec/services/orders/available_shipping_methods_service_spec.rb
+++ b/spec/services/orders/available_shipping_methods_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::AvailableShippingMethodsService do
+RSpec.describe Orders::AvailableShippingMethodsService do
   context "when the order has no current_distributor" do
     it "returns an empty array" do
       order_cycle = create(:sells_own_order_cycle)
diff --git a/spec/services/orders/cart_reset_service_spec.rb b/spec/services/orders/cart_reset_service_spec.rb
index 05e2ea4387..3c4b01048d 100644
--- a/spec/services/orders/cart_reset_service_spec.rb
+++ b/spec/services/orders/cart_reset_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::CartResetService do
+RSpec.describe Orders::CartResetService do
   let(:distributor) { create(:distributor_enterprise) }
   let(:order) { create(:order, :with_line_item, distributor:) }
 
diff --git a/spec/services/orders/checkout_restart_service_spec.rb b/spec/services/orders/checkout_restart_service_spec.rb
index 414838e31b..3ebc3284b4 100644
--- a/spec/services/orders/checkout_restart_service_spec.rb
+++ b/spec/services/orders/checkout_restart_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::CheckoutRestartService do
+RSpec.describe Orders::CheckoutRestartService do
   let(:order) { create(:order_with_distributor) }
 
   describe "#call" do
diff --git a/spec/services/orders/compare_invoice_service_spec.rb b/spec/services/orders/compare_invoice_service_spec.rb
index 932e5b54b6..19ad37422a 100644
--- a/spec/services/orders/compare_invoice_service_spec.rb
+++ b/spec/services/orders/compare_invoice_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples "attribute changes - payment total" do |boolean, type|
+RSpec.shared_examples "attribute changes - payment total" do |boolean, type|
   before do
     Spree::Order.where(id: order.id).update_all(payment_total: order.payment_total + 10)
   end
@@ -13,7 +13,7 @@ shared_examples "attribute changes - payment total" do |boolean, type|
   end
 end
 
-shared_examples "attribute changes - order total" do |boolean, type|
+RSpec.shared_examples "attribute changes - order total" do |boolean, type|
   before do
     Spree::Order.where(id: order.id).update_all(total: order.total + 10)
   end
@@ -24,7 +24,7 @@ shared_examples "attribute changes - order total" do |boolean, type|
   end
 end
 
-shared_examples "attribute changes - order state: cancelled" do |boolean, type|
+RSpec.shared_examples "attribute changes - order state: cancelled" do |boolean, type|
   before do
     order.cancel!
   end
@@ -35,7 +35,7 @@ shared_examples "attribute changes - order state: cancelled" do |boolean, type|
   end
 end
 
-shared_examples "attribute changes - tax total changes" do |boolean, type, included_boolean|
+RSpec.shared_examples "attribute changes - tax total changes" do |boolean, type, included_boolean|
   let(:order) do
     create(:order_with_taxes, product_price: 110, tax_rate_amount: 0.1,
                               included_in_price: included_boolean)
@@ -58,7 +58,7 @@ shared_examples "attribute changes - tax total changes" do |boolean, type, inclu
   end
 end
 
-shared_examples "attribute changes - shipping method" do |boolean, type|
+RSpec.shared_examples "attribute changes - shipping method" do |boolean, type|
   let(:shipping_method) { create(:shipping_method) }
 
   before do
@@ -71,13 +71,13 @@ shared_examples "attribute changes - shipping method" do |boolean, type|
   end
 end
 
-shared_examples "no attribute changes" do
+RSpec.shared_examples "no attribute changes" do
   it "returns false if no attribute has changed" do
     expect(subject).to be false
   end
 end
 
-shared_examples "attribute changes - special insctructions" do |boolean, type|
+RSpec.shared_examples "attribute changes - special insctructions" do |boolean, type|
   before do
     order.update!(special_instructions: "A very special insctruction.")
   end
@@ -86,7 +86,7 @@ shared_examples "attribute changes - special insctructions" do |boolean, type|
   end
 end
 
-shared_examples "attribute changes - note" do |boolean, type|
+RSpec.shared_examples "attribute changes - note" do |boolean, type|
   before do
     order.update!(note: "THIS IS A NEW NOTE")
   end
@@ -95,7 +95,8 @@ shared_examples "attribute changes - note" do |boolean, type|
   end
 end
 
-shared_examples "associated attribute changes - adjustments (create/delete)" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - adjustments (create/delete)" do
+  |boolean, type|
   context "creating an adjustment" do
     before { order.adjustments << create(:adjustment, order:) }
     it "returns #{boolean} if a #{type} attribute changes" do
@@ -111,7 +112,7 @@ shared_examples "associated attribute changes - adjustments (create/delete)" do
   end
 end
 
-shared_examples "associated attribute changes - adjustments (edit amount)" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - adjustments (edit amount)" do |boolean, type|
   context "with an existing adjustments" do
     context "editing the amount" do
       before { order.all_adjustments.first.update!(amount: 123) }
@@ -122,7 +123,7 @@ shared_examples "associated attribute changes - adjustments (edit amount)" do |b
   end
 end
 
-shared_examples "associated attribute changes - adjustments (edit label)" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - adjustments (edit label)" do |boolean, type|
   context "adjustment changes" do
     context "editing the label" do
       before { order.all_adjustments.first.update!(label: "It's a new label") }
@@ -133,7 +134,7 @@ shared_examples "associated attribute changes - adjustments (edit label)" do |bo
   end
 end
 
-shared_examples "associated attribute changes - line items" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - line items" do |boolean, type|
   context "line item changes" do
     let(:line_item){ order.line_items.first }
     context "on quantitity" do
@@ -154,7 +155,7 @@ shared_examples "associated attribute changes - line items" do |boolean, type|
   end
 end
 
-shared_examples "associated attribute changes - bill address" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - bill address" do |boolean, type|
   context "bill address - a #{type}" do
     let(:bill_address) { Spree::Address.where(id: order.bill_address_id) }
     it "first name" do
@@ -207,7 +208,7 @@ shared_examples "associated attribute changes - bill address" do |boolean, type|
   end
 end
 
-shared_examples "associated attribute changes - ship address" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - ship address" do |boolean, type|
   context "ship address - a #{type}" do
     let(:ship_address) { Spree::Address.where(id: order.ship_address_id) }
     it "first name" do
@@ -260,7 +261,7 @@ shared_examples "associated attribute changes - ship address" do |boolean, type|
   end
 end
 
-shared_examples "associated attribute changes - payments" do |boolean, type|
+RSpec.shared_examples "associated attribute changes - payments" do |boolean, type|
   context "payment changes on" do
     let(:payment) { create(:payment, order_id: order.id) }
     context "amount" do
@@ -284,7 +285,7 @@ shared_examples "associated attribute changes - payments" do |boolean, type|
   end
 end
 
-shared_examples "attribute changes - payment state" do |boolean, type|
+RSpec.shared_examples "attribute changes - payment state" do |boolean, type|
   let(:payment) { order.payments.first }
   context "payment changes on" do
     context "state" do
@@ -299,7 +300,7 @@ shared_examples "attribute changes - payment state" do |boolean, type|
   end
 end
 
-describe Orders::CompareInvoiceService do
+RSpec.describe Orders::CompareInvoiceService do
   let!(:invoice){
     create(:invoice,
            order:,
diff --git a/spec/services/orders/customer_cancellation_service_spec.rb b/spec/services/orders/customer_cancellation_service_spec.rb
index 624ea08fd3..a7b3e7aad8 100644
--- a/spec/services/orders/customer_cancellation_service_spec.rb
+++ b/spec/services/orders/customer_cancellation_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::CustomerCancellationService do
+RSpec.describe Orders::CustomerCancellationService do
   let(:mail_mock) { double(:mailer_mock, deliver_later: true) }
   before do
     allow(Spree::OrderMailer).to receive(:cancel_email_for_shop) { mail_mock }
diff --git a/spec/services/orders/factory_service_spec.rb b/spec/services/orders/factory_service_spec.rb
index 26c8ec2564..aee3bea3cb 100644
--- a/spec/services/orders/factory_service_spec.rb
+++ b/spec/services/orders/factory_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::FactoryService do
+RSpec.describe Orders::FactoryService do
   let(:variant1) { create(:variant, price: 5.0) }
   let(:variant2) { create(:variant, price: 7.0) }
   let(:user) { create(:user) }
diff --git a/spec/services/orders/find_payment_service_spec.rb b/spec/services/orders/find_payment_service_spec.rb
index 0777d5ed2c..1e898f7e53 100644
--- a/spec/services/orders/find_payment_service_spec.rb
+++ b/spec/services/orders/find_payment_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::FindPaymentService do
+RSpec.describe Orders::FindPaymentService do
   let(:order) { create(:order_with_distributor) }
   let(:finder) { Orders::FindPaymentService.new(order) }
 
diff --git a/spec/services/orders/generate_invoice_service_spec.rb b/spec/services/orders/generate_invoice_service_spec.rb
index 50fb5350d5..a396a26897 100644
--- a/spec/services/orders/generate_invoice_service_spec.rb
+++ b/spec/services/orders/generate_invoice_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::GenerateInvoiceService do
+RSpec.describe Orders::GenerateInvoiceService do
   let!(:order) { create(:completed_order_with_fees) }
   let!(:invoice_data_generator){ InvoiceDataGenerator.new(order) }
   let!(:latest_invoice){
diff --git a/spec/services/orders/handle_fees_service_spec.rb b/spec/services/orders/handle_fees_service_spec.rb
index 6b92683331..f31ce21ce2 100644
--- a/spec/services/orders/handle_fees_service_spec.rb
+++ b/spec/services/orders/handle_fees_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::HandleFeesService do
+RSpec.describe Orders::HandleFeesService do
   let(:order_cycle) { create(:order_cycle) }
   let(:order) { create(:order_with_line_items, line_items_count: 1, order_cycle:) }
   let(:line_item) { order.line_items.first }
diff --git a/spec/services/orders/mask_data_service_spec.rb b/spec/services/orders/mask_data_service_spec.rb
index f23141922c..aed4ba48a8 100644
--- a/spec/services/orders/mask_data_service_spec.rb
+++ b/spec/services/orders/mask_data_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Orders::MaskDataService do
+RSpec.describe Orders::MaskDataService do
   describe '#call' do
     let(:distributor) { create(:enterprise) }
     let(:order) { create(:order, distributor:, ship_address: create(:address)) }
diff --git a/spec/services/orders/order_tax_adjustments_fetcher_spec.rb b/spec/services/orders/order_tax_adjustments_fetcher_spec.rb
index f45280c27a..af19dd22f8 100644
--- a/spec/services/orders/order_tax_adjustments_fetcher_spec.rb
+++ b/spec/services/orders/order_tax_adjustments_fetcher_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Orders::FetchTaxAdjustmentsService do
+RSpec.describe Orders::FetchTaxAdjustmentsService do
   describe "#totals" do
     let(:zone) { create(:zone_with_member) }
     let(:coordinator) { create(:distributor_enterprise, charges_sales_tax: true) }
diff --git a/spec/services/orders/sync_service_spec.rb b/spec/services/orders/sync_service_spec.rb
index f45a009a9c..9dd6eb968d 100644
--- a/spec/services/orders/sync_service_spec.rb
+++ b/spec/services/orders/sync_service_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Orders::SyncService do
+RSpec.describe Orders::SyncService do
   describe "updating the shipping method" do
     let!(:subscription) { create(:subscription, with_items: true, with_proxy_orders: true) }
     let!(:order) { subscription.proxy_orders.first.initialise_order! }
diff --git a/spec/services/orders/workflow_service_spec.rb b/spec/services/orders/workflow_service_spec.rb
index 08e48fa0cd..d1db9ff3c3 100644
--- a/spec/services/orders/workflow_service_spec.rb
+++ b/spec/services/orders/workflow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Orders::WorkflowService do
+RSpec.describe Orders::WorkflowService do
   let!(:distributor) { create(:distributor_enterprise) }
   let!(:order) do
     create(:order_with_totals_and_distribution, distributor:,
diff --git a/spec/services/path_checker_spec.rb b/spec/services/path_checker_spec.rb
index e0a4160e18..2ce16c19b5 100644
--- a/spec/services/path_checker_spec.rb
+++ b/spec/services/path_checker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PathChecker do
+RSpec.describe PathChecker do
   describe "#active_path?" do
     let(:view_context) { double("view context") }
 
diff --git a/spec/services/paypal_items_builder_spec.rb b/spec/services/paypal_items_builder_spec.rb
index 227422b612..f34be2f6ac 100644
--- a/spec/services/paypal_items_builder_spec.rb
+++ b/spec/services/paypal_items_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PaypalItemsBuilder do
+RSpec.describe PaypalItemsBuilder do
   let(:order) { create(:completed_order_with_fees) }
   let(:service) { described_class.new(order) }
   let(:items) { described_class.new(order).call }
diff --git a/spec/services/permissions/order_spec.rb b/spec/services/permissions/order_spec.rb
index 2e3ba313ee..385b4a336a 100644
--- a/spec/services/permissions/order_spec.rb
+++ b/spec/services/permissions/order_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Permissions
-  describe Order do
+  RSpec.describe Order do
     let(:user) { double(:user) }
     let(:permissions) { Permissions::Order.new(user) }
     let!(:basic_permissions) { OpenFoodNetwork::Permissions.new(user) }
diff --git a/spec/services/permitted_attributes/order_cycle_spec.rb b/spec/services/permitted_attributes/order_cycle_spec.rb
index 6990548af1..1036e426b2 100644
--- a/spec/services/permitted_attributes/order_cycle_spec.rb
+++ b/spec/services/permitted_attributes/order_cycle_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module PermittedAttributes
-  describe OrderCycle do
+  RSpec.describe OrderCycle do
     let(:oc_permitted_attributes) { PermittedAttributes::OrderCycle.new(params) }
 
     describe "with basic attributes" do
diff --git a/spec/services/permitted_attributes/user_spec.rb b/spec/services/permitted_attributes/user_spec.rb
index 8b98311efa..e5119d696e 100644
--- a/spec/services/permitted_attributes/user_spec.rb
+++ b/spec/services/permitted_attributes/user_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module PermittedAttributes
-  describe User do
+  RSpec.describe User do
     describe "simple usage" do
       let(:user_permitted_attributes) { PermittedAttributes::User.new(params) }
 
diff --git a/spec/services/place_proxy_order_spec.rb b/spec/services/place_proxy_order_spec.rb
index 2fc895ec53..4fd895d8d9 100644
--- a/spec/services/place_proxy_order_spec.rb
+++ b/spec/services/place_proxy_order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PlaceProxyOrder do
+RSpec.describe PlaceProxyOrder do
   include ActiveSupport::Testing::TimeHelpers
 
   subject { described_class.new(proxy_order, summarizer, logger, stock_changes_loader) }
diff --git a/spec/services/process_payment_intent_spec.rb b/spec/services/process_payment_intent_spec.rb
index 51ab52294f..10af03a91e 100644
--- a/spec/services/process_payment_intent_spec.rb
+++ b/spec/services/process_payment_intent_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProcessPaymentIntent do
+RSpec.describe ProcessPaymentIntent do
   let(:service) { described_class.new }
 
   describe "processing a payment intent" do
diff --git a/spec/services/product_filters_spec.rb b/spec/services/product_filters_spec.rb
index 056e3c1681..dce7571c1e 100644
--- a/spec/services/product_filters_spec.rb
+++ b/spec/services/product_filters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductFilters do
+RSpec.describe ProductFilters do
   describe "extract" do
     it "should return a hash including only key from ProductFilters::PRODUCT_FILTERS" do
       params = { 'id' => 20, 'producerFilter' => 2, 'categoryFilter' => 5 }
diff --git a/spec/services/product_tag_rules_filterer_spec.rb b/spec/services/product_tag_rules_filterer_spec.rb
index 1302788381..eafd6d6d38 100644
--- a/spec/services/product_tag_rules_filterer_spec.rb
+++ b/spec/services/product_tag_rules_filterer_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe ProductTagRulesFilterer do
+RSpec.describe ProductTagRulesFilterer do
   describe "filtering by tag rules" do
     let!(:distributor) { create(:distributor_enterprise) }
     let(:product) { create(:product, supplier: distributor) }
diff --git a/spec/services/products_renderer_spec.rb b/spec/services/products_renderer_spec.rb
index 179233fe2d..0913c61ee9 100644
--- a/spec/services/products_renderer_spec.rb
+++ b/spec/services/products_renderer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProductsRenderer do
+RSpec.describe ProductsRenderer do
   let(:distributor) { create(:distributor_enterprise) }
   let(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
   let(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
diff --git a/spec/services/search_orders_spec.rb b/spec/services/search_orders_spec.rb
index 6abf20fcf5..3b3de62b4e 100644
--- a/spec/services/search_orders_spec.rb
+++ b/spec/services/search_orders_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SearchOrders do
+RSpec.describe SearchOrders do
   let!(:distributor) { create(:distributor_enterprise) }
   let!(:order1) { create(:order_with_line_items, distributor:, line_items_count: 3) }
   let!(:order2) { create(:order_with_line_items, distributor:, line_items_count: 2) }
diff --git a/spec/services/sets/model_set_spec.rb b/spec/services/sets/model_set_spec.rb
index b783872f9e..bf9f7b37ec 100644
--- a/spec/services/sets/model_set_spec.rb
+++ b/spec/services/sets/model_set_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Sets::ModelSet do
+RSpec.describe Sets::ModelSet do
   describe "updating" do
     it "creates new models" do
       attrs = { collection_attributes: { '1' => { name: "Fantasia", iso_name: "FAN" },
diff --git a/spec/services/sets/product_set_spec.rb b/spec/services/sets/product_set_spec.rb
index 88eb990e9d..b60dd0f2a5 100644
--- a/spec/services/sets/product_set_spec.rb
+++ b/spec/services/sets/product_set_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Sets::ProductSet do
+RSpec.describe Sets::ProductSet do
   describe '#save' do
     let(:product_set) do
       described_class.new(collection_attributes: collection_hash)
diff --git a/spec/services/shop/order_cycles_list_spec.rb b/spec/services/shop/order_cycles_list_spec.rb
index 30febf01e2..5b5e230fb1 100644
--- a/spec/services/shop/order_cycles_list_spec.rb
+++ b/spec/services/shop/order_cycles_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Shop::OrderCyclesList do
+RSpec.describe Shop::OrderCyclesList do
   describe ".active_for" do
     let(:customer) { nil }
 
diff --git a/spec/services/stripe_payment_status_spec.rb b/spec/services/stripe_payment_status_spec.rb
index 3e9b17fa21..08e8b7f234 100644
--- a/spec/services/stripe_payment_status_spec.rb
+++ b/spec/services/stripe_payment_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StripePaymentStatus, :vcr, :stripe_version do
+RSpec.describe StripePaymentStatus, :vcr, :stripe_version do
   subject { StripePaymentStatus.new(payment) }
 
   let(:credit_card) { create(:credit_card, gateway_payment_profile_id: pm_card.id) }
diff --git a/spec/services/tax_rate_finder_spec.rb b/spec/services/tax_rate_finder_spec.rb
index 3ceca79607..0464565ef0 100644
--- a/spec/services/tax_rate_finder_spec.rb
+++ b/spec/services/tax_rate_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TaxRateFinder do
+RSpec.describe TaxRateFinder do
   describe "getting the corresponding tax rate" do
     let(:amount) { BigDecimal(120) }
     let(:tax_rate) {
diff --git a/spec/services/tax_rate_updater_spec.rb b/spec/services/tax_rate_updater_spec.rb
index baa3b6d4a6..93c3223220 100644
--- a/spec/services/tax_rate_updater_spec.rb
+++ b/spec/services/tax_rate_updater_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TaxRateUpdater do
+RSpec.describe TaxRateUpdater do
   let!(:old_tax_rate) {
     create(:tax_rate, name: "Test Rate", amount: 0.2, calculator: Calculator::DefaultTax.new)
   }
diff --git a/spec/services/terms_of_service_spec.rb b/spec/services/terms_of_service_spec.rb
index 22151ee0bc..c2b4021b7e 100644
--- a/spec/services/terms_of_service_spec.rb
+++ b/spec/services/terms_of_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TermsOfService do
+RSpec.describe TermsOfService do
   let(:customer) { create(:customer) }
   let(:distributor) { create(:distributor_enterprise) }
 
diff --git a/spec/services/unit_prices_spec.rb b/spec/services/unit_prices_spec.rb
index ef9aa86bee..2219eab6c8 100644
--- a/spec/services/unit_prices_spec.rb
+++ b/spec/services/unit_prices_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UnitPrice do
+RSpec.describe UnitPrice do
   subject { UnitPrice.new(variant) }
   let(:variant) { Spree::Variant.new }
   let(:product) { instance_double(Spree::Product) }
diff --git a/spec/services/upload_sanitizer_spec.rb b/spec/services/upload_sanitizer_spec.rb
index c90625fe72..e766fa7ec8 100644
--- a/spec/services/upload_sanitizer_spec.rb
+++ b/spec/services/upload_sanitizer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UploadSanitizer do
+RSpec.describe UploadSanitizer do
   describe "#call" do
     let(:upload) do
       File.open("/tmp/unsanitized.csv", 'wb:ascii-8bit') do |f|
diff --git a/spec/services/url_generator_spec.rb b/spec/services/url_generator_spec.rb
index f33c093bf9..fcb0d78edd 100644
--- a/spec/services/url_generator_spec.rb
+++ b/spec/services/url_generator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UrlGenerator do
+RSpec.describe UrlGenerator do
   subject { UrlGenerator }
 
   describe "#to_url" do
diff --git a/spec/services/user_default_address_setter_spec.rb b/spec/services/user_default_address_setter_spec.rb
index 2e8ec3319d..e90d53b32b 100644
--- a/spec/services/user_default_address_setter_spec.rb
+++ b/spec/services/user_default_address_setter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserDefaultAddressSetter do
+RSpec.describe UserDefaultAddressSetter do
   let(:customer_address) { create(:address, address1: "customer road") }
   let(:order_address) { create(:address, address1: "order road") }
   let(:customer) do
diff --git a/spec/services/user_locale_setter_spec.rb b/spec/services/user_locale_setter_spec.rb
index 5b0bc0e69b..9e3223c52e 100644
--- a/spec/services/user_locale_setter_spec.rb
+++ b/spec/services/user_locale_setter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserLocaleSetter do
+RSpec.describe UserLocaleSetter do
   let(:user) { create(:user) }
   let(:default_locale) { I18n.default_locale }
   let(:locale_params) { {} }
diff --git a/spec/services/variant_overrides_indexed_spec.rb b/spec/services/variant_overrides_indexed_spec.rb
index 62cc1e6228..d789c048c7 100644
--- a/spec/services/variant_overrides_indexed_spec.rb
+++ b/spec/services/variant_overrides_indexed_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VariantOverridesIndexed do
+RSpec.describe VariantOverridesIndexed do
   subject(:variant_overrides) { described_class.new([variant.id], [distributor.id]) }
 
   let(:distributor) { create(:distributor_enterprise) }
diff --git a/spec/services/variant_units/option_value_namer_spec.rb b/spec/services/variant_units/option_value_namer_spec.rb
index 6d71ac3966..8c2ac4f537 100644
--- a/spec/services/variant_units/option_value_namer_spec.rb
+++ b/spec/services/variant_units/option_value_namer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module VariantUnits
-  describe OptionValueNamer do
+  RSpec.describe OptionValueNamer do
     describe "generating option value name" do
       let(:v) { Spree::Variant.new }
       let(:p) { Spree::Product.new }
diff --git a/spec/services/variants_stock_levels_spec.rb b/spec/services/variants_stock_levels_spec.rb
index 475f9fb452..630fc2c2de 100644
--- a/spec/services/variants_stock_levels_spec.rb
+++ b/spec/services/variants_stock_levels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VariantsStockLevels do
+RSpec.describe VariantsStockLevels do
   let(:order) { create(:order) }
 
   let!(:line_item) do
diff --git a/spec/services/voucher_adjustments_service_spec.rb b/spec/services/voucher_adjustments_service_spec.rb
index 87df60558e..d9f05fb1df 100644
--- a/spec/services/voucher_adjustments_service_spec.rb
+++ b/spec/services/voucher_adjustments_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe VoucherAdjustmentsService do
+RSpec.describe VoucherAdjustmentsService do
   describe '#update' do
     let(:enterprise) { build(:enterprise) }
 
diff --git a/spec/services/weights_and_measures_spec.rb b/spec/services/weights_and_measures_spec.rb
index 59877062ec..22d337308c 100644
--- a/spec/services/weights_and_measures_spec.rb
+++ b/spec/services/weights_and_measures_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe WeightsAndMeasures do
+RSpec.describe WeightsAndMeasures do
   subject { WeightsAndMeasures.new(variant) }
   let(:variant) { Spree::Variant.new }
   let(:product) { instance_double(Spree::Product) }
diff --git a/spec/system/admin/adjustments_spec.rb b/spec/system/admin/adjustments_spec.rb
index cbe5f8f7d5..bc525c819e 100644
--- a/spec/system/admin/adjustments_spec.rb
+++ b/spec/system/admin/adjustments_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage adjustments on orders
 ' do
diff --git a/spec/system/admin/authentication_spec.rb b/spec/system/admin/authentication_spec.rb
index 426ac758a8..74a7d71412 100644
--- a/spec/system/admin/authentication_spec.rb
+++ b/spec/system/admin/authentication_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Authentication" do
+RSpec.describe "Authentication" do
   include UIComponentHelper
   include AuthenticationHelper
   include WebHelper
diff --git a/spec/system/admin/bulk_order_cancellation_spec.rb b/spec/system/admin/bulk_order_cancellation_spec.rb
index c07ccfe9e1..bb2084976f 100644
--- a/spec/system/admin/bulk_order_cancellation_spec.rb
+++ b/spec/system/admin/bulk_order_cancellation_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As an Administrator
   I want to be able to delete orders in bulk
 ' do
diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb
index ccf0141afd..8e00eff139 100644
--- a/spec/system/admin/bulk_order_management_spec.rb
+++ b/spec/system/admin/bulk_order_management_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As an Administrator
   I want to be able to manage orders in bulk
 ' do
diff --git a/spec/system/admin/bulk_product_update_spec.rb b/spec/system/admin/bulk_product_update_spec.rb
index 1f954dc142..7ccab2766a 100644
--- a/spec/system/admin/bulk_product_update_spec.rb
+++ b/spec/system/admin/bulk_product_update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As an Administrator
   I want to be able to manage products in bulk
 ' do
diff --git a/spec/system/admin/configuration/content_spec.rb b/spec/system/admin/configuration/content_spec.rb
index a74bd03421..8e44066e70 100644
--- a/spec/system/admin/configuration/content_spec.rb
+++ b/spec/system/admin/configuration/content_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "
+RSpec.describe "
   As a site administrator
   I want to configure the site content
 " do
diff --git a/spec/system/admin/configuration/general_settings_spec.rb b/spec/system/admin/configuration/general_settings_spec.rb
index ddbf01bbd3..cc352c745b 100644
--- a/spec/system/admin/configuration/general_settings_spec.rb
+++ b/spec/system/admin/configuration/general_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "General Settings" do
+RSpec.describe "General Settings" do
   include AuthenticationHelper
 
   before do
diff --git a/spec/system/admin/configuration/mail_methods_spec.rb b/spec/system/admin/configuration/mail_methods_spec.rb
index 0bf637ea58..643ee1dc7a 100644
--- a/spec/system/admin/configuration/mail_methods_spec.rb
+++ b/spec/system/admin/configuration/mail_methods_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Mail Methods" do
+RSpec.describe "Mail Methods" do
   include AuthenticationHelper
 
   before do
diff --git a/spec/system/admin/configuration/shipping_categories_spec.rb b/spec/system/admin/configuration/shipping_categories_spec.rb
index 6b554852a4..7e884d0aeb 100644
--- a/spec/system/admin/configuration/shipping_categories_spec.rb
+++ b/spec/system/admin/configuration/shipping_categories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Shipping Categories" do
+RSpec.describe "Shipping Categories" do
   include AuthenticationHelper
   include WebHelper
   let(:admin_role) { Spree::Role.find_or_create_by!(name: 'admin') }
diff --git a/spec/system/admin/configuration/states_spec.rb b/spec/system/admin/configuration/states_spec.rb
index 8f44e48957..0653a429f3 100644
--- a/spec/system/admin/configuration/states_spec.rb
+++ b/spec/system/admin/configuration/states_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "States" do
+RSpec.describe "States" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/configuration/tax_categories_spec.rb b/spec/system/admin/configuration/tax_categories_spec.rb
index 61410c0663..ea5074d8bf 100644
--- a/spec/system/admin/configuration/tax_categories_spec.rb
+++ b/spec/system/admin/configuration/tax_categories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Tax Categories" do
+RSpec.describe "Tax Categories" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/configuration/tax_rates_spec.rb b/spec/system/admin/configuration/tax_rates_spec.rb
index da48c549d8..87c60b2392 100644
--- a/spec/system/admin/configuration/tax_rates_spec.rb
+++ b/spec/system/admin/configuration/tax_rates_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Tax Rates" do
+RSpec.describe "Tax Rates" do
   include AuthenticationHelper
 
   let!(:calculator) { create(:calculator_per_item, calculable: create(:order)) }
diff --git a/spec/system/admin/configuration/taxonomies_spec.rb b/spec/system/admin/configuration/taxonomies_spec.rb
index b5dea632fd..5f4771cbd6 100644
--- a/spec/system/admin/configuration/taxonomies_spec.rb
+++ b/spec/system/admin/configuration/taxonomies_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Taxonomies" do
+RSpec.describe "Taxonomies" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/configuration/terms_of_service_files_spec.rb b/spec/system/admin/configuration/terms_of_service_files_spec.rb
index fad947a089..1a1ca75d3d 100644
--- a/spec/system/admin/configuration/terms_of_service_files_spec.rb
+++ b/spec/system/admin/configuration/terms_of_service_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Terms of Service files" do
+RSpec.describe "Terms of Service files" do
   include AuthenticationHelper
 
   describe "as admin" do
diff --git a/spec/system/admin/configuration/zones_spec.rb b/spec/system/admin/configuration/zones_spec.rb
index 36e7bf9969..134d4c14f7 100644
--- a/spec/system/admin/configuration/zones_spec.rb
+++ b/spec/system/admin/configuration/zones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Zones" do
+RSpec.describe "Zones" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/customers_spec.rb b/spec/system/admin/customers_spec.rb
index b8ab97768e..44417d2110 100644
--- a/spec/system/admin/customers_spec.rb
+++ b/spec/system/admin/customers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Customers' do
+RSpec.describe 'Customers' do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
diff --git a/spec/system/admin/dfc_product_import_spec.rb b/spec/system/admin/dfc_product_import_spec.rb
index 195c8370c5..224b4d89af 100644
--- a/spec/system/admin/dfc_product_import_spec.rb
+++ b/spec/system/admin/dfc_product_import_spec.rb
@@ -3,7 +3,7 @@
 require 'system_helper'
 require_relative '../../../engines/dfc_provider/spec/support/authorization_helper'
 
-describe "DFC Product Import" do
+RSpec.describe "DFC Product Import" do
   include AuthorizationHelper
 
   let(:user) { create(:oidc_user, owned_enterprises: [enterprise]) }
diff --git a/spec/system/admin/enterprise_fees_spec.rb b/spec/system/admin/enterprise_fees_spec.rb
index 53dbaf2e33..2c90e748e8 100644
--- a/spec/system/admin/enterprise_fees_spec.rb
+++ b/spec/system/admin/enterprise_fees_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage enterprise fees
 ' do
diff --git a/spec/system/admin/enterprise_groups_spec.rb b/spec/system/admin/enterprise_groups_spec.rb
index d025aa8cc8..786eb9df5e 100644
--- a/spec/system/admin/enterprise_groups_spec.rb
+++ b/spec/system/admin/enterprise_groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage enterprise groups
 ' do
diff --git a/spec/system/admin/enterprise_relationships_spec.rb b/spec/system/admin/enterprise_relationships_spec.rb
index 50b2b89e33..1e86c9d229 100644
--- a/spec/system/admin/enterprise_relationships_spec.rb
+++ b/spec/system/admin/enterprise_relationships_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As an Administrator
   I want to manage relationships between enterprises
 ' do
diff --git a/spec/system/admin/enterprise_roles_spec.rb b/spec/system/admin/enterprise_roles_spec.rb
index 2b7be496ca..e3be5b5862 100644
--- a/spec/system/admin/enterprise_roles_spec.rb
+++ b/spec/system/admin/enterprise_roles_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As an Administrator
   I want to manage relationships between users and enterprises
 ' do
diff --git a/spec/system/admin/enterprise_user_spec.rb b/spec/system/admin/enterprise_user_spec.rb
index b8435cbef7..ce04a15196 100644
--- a/spec/system/admin/enterprise_user_spec.rb
+++ b/spec/system/admin/enterprise_user_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As a Super User
     I want to setup users to manage an enterprise
 ' do
diff --git a/spec/system/admin/enterprises/business_address_form_spec.rb b/spec/system/admin/enterprises/business_address_form_spec.rb
index 37b82c8489..ffec4468a2 100644
--- a/spec/system/admin/enterprises/business_address_form_spec.rb
+++ b/spec/system/admin/enterprises/business_address_form_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Business Address" do
+RSpec.describe "Business Address" do
   include WebHelper
   include AuthenticationHelper
 
diff --git a/spec/system/admin/enterprises/connected_apps_spec.rb b/spec/system/admin/enterprises/connected_apps_spec.rb
index 2be667e904..23bf8d4fe0 100644
--- a/spec/system/admin/enterprises/connected_apps_spec.rb
+++ b/spec/system/admin/enterprises/connected_apps_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Connected Apps", feature: :connected_apps, vcr: true do
+RSpec.describe "Connected Apps", feature: :connected_apps, vcr: true do
   let(:enterprise) { create(:enterprise) }
 
   before do
diff --git a/spec/system/admin/enterprises/images_spec.rb b/spec/system/admin/enterprises/images_spec.rb
index f5f1ccdb97..972485d32a 100644
--- a/spec/system/admin/enterprises/images_spec.rb
+++ b/spec/system/admin/enterprises/images_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Managing enterprise images" do
+RSpec.describe "Managing enterprise images" do
   include WebHelper
   include FileHelper
   include AuthenticationHelper
diff --git a/spec/system/admin/enterprises/index_spec.rb b/spec/system/admin/enterprises/index_spec.rb
index c79780b490..239ca72a92 100644
--- a/spec/system/admin/enterprises/index_spec.rb
+++ b/spec/system/admin/enterprises/index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Enterprises Index' do
+RSpec.describe 'Enterprises Index' do
   include WebHelper
   include AuthenticationHelper
 
diff --git a/spec/system/admin/enterprises/terms_and_conditions_spec.rb b/spec/system/admin/enterprises/terms_and_conditions_spec.rb
index e8a5f33bd7..15301c3760 100644
--- a/spec/system/admin/enterprises/terms_and_conditions_spec.rb
+++ b/spec/system/admin/enterprises/terms_and_conditions_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Uploading Terms and Conditions PDF" do
+RSpec.describe "Uploading Terms and Conditions PDF" do
   include AuthenticationHelper
   include FileHelper
 
diff --git a/spec/system/admin/enterprises_spec.rb b/spec/system/admin/enterprises_spec.rb
index 92fdf304d3..caabb4a006 100644
--- a/spec/system/admin/enterprises_spec.rb
+++ b/spec/system/admin/enterprises_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage enterprises
 ' do
diff --git a/spec/system/admin/flatpickr_spec.rb b/spec/system/admin/flatpickr_spec.rb
index 901566a0eb..434b24a2b0 100644
--- a/spec/system/admin/flatpickr_spec.rb
+++ b/spec/system/admin/flatpickr_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Test Flatpickr" do
+RSpec.describe "Test Flatpickr" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/invoice_print_spec.rb b/spec/system/admin/invoice_print_spec.rb
index e4246a9d69..9596a7d191 100644
--- a/spec/system/admin/invoice_print_spec.rb
+++ b/spec/system/admin/invoice_print_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want to print a invoice as PDF
 ', type: :feature do
diff --git a/spec/system/admin/multilingual_spec.rb b/spec/system/admin/multilingual_spec.rb
index 82e3894e6b..e8de421d75 100644
--- a/spec/system/admin/multilingual_spec.rb
+++ b/spec/system/admin/multilingual_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Multilingual' do
+RSpec.describe 'Multilingual' do
   include AuthenticationHelper
   include WebHelper
   let(:admin_role) { Spree::Role.find_or_create_by!(name: 'admin') }
diff --git a/spec/system/admin/oidc_settings_spec.rb b/spec/system/admin/oidc_settings_spec.rb
index 3402bc6797..ca63a8b3e8 100644
--- a/spec/system/admin/oidc_settings_spec.rb
+++ b/spec/system/admin/oidc_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "OIDC Settings" do
+RSpec.describe "OIDC Settings" do
   it "requires login" do
     visit admin_oidc_settings_path
     expect(page).to have_button "Login"
diff --git a/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
index ad5c818721..958ca4931a 100644
--- a/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
+++ b/spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to create/update complex order cycles with a specific time
 ' do
diff --git a/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
index ac602ec42f..fdc41f3ebe 100644
--- a/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage complex order cycles
 ' do
diff --git a/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
index 122085e583..23aa655a77 100644
--- a/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage complex order cycles
 ' do
diff --git a/spec/system/admin/order_cycles/complex_editing_multiple_updation_spec.rb b/spec/system/admin/order_cycles/complex_editing_multiple_updation_spec.rb
index ba68c626e5..5d744c1c71 100644
--- a/spec/system/admin/order_cycles/complex_editing_multiple_updation_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_multiple_updation_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to see alert for unsaved changes on order cycle edit page
 ' do
diff --git a/spec/system/admin/order_cycles/complex_editing_spec.rb b/spec/system/admin/order_cycles/complex_editing_spec.rb
index 1438de2510..3635cf69e9 100644
--- a/spec/system/admin/order_cycles/complex_editing_spec.rb
+++ b/spec/system/admin/order_cycles/complex_editing_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage complex order cycles
 ' do
diff --git a/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
index 3e7d02d2b3..4d109e5243 100644
--- a/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
+++ b/spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-xdescribe '
+RSpec.xdescribe '
     As an administrator
     I want to create/update complex order cycles with a specific time
 ' do
diff --git a/spec/system/admin/order_cycles/list_spec.rb b/spec/system/admin/order_cycles/list_spec.rb
index 308f95a36f..2c95656555 100644
--- a/spec/system/admin/order_cycles/list_spec.rb
+++ b/spec/system/admin/order_cycles/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to list and filter order cycles
 ' do
diff --git a/spec/system/admin/order_cycles/simple_spec.rb b/spec/system/admin/order_cycles/simple_spec.rb
index 364048ee9d..1ce165d630 100644
--- a/spec/system/admin/order_cycles/simple_spec.rb
+++ b/spec/system/admin/order_cycles/simple_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage simple order cycles
 ' do
diff --git a/spec/system/admin/order_cycles_complex_nav_check_spec.rb b/spec/system/admin/order_cycles_complex_nav_check_spec.rb
index 7fb590294b..3c3bc5622c 100644
--- a/spec/system/admin/order_cycles_complex_nav_check_spec.rb
+++ b/spec/system/admin/order_cycles_complex_nav_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an administrator
     I want to be alerted when I navigate away from a dirty order cycle form
 ' do
diff --git a/spec/system/admin/order_spec.rb b/spec/system/admin/order_spec.rb
index f6f5f96fe0..9cf328d69f 100644
--- a/spec/system/admin/order_spec.rb
+++ b/spec/system/admin/order_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want to create and edit orders
 ' do
diff --git a/spec/system/admin/orders/invoices_spec.rb b/spec/system/admin/orders/invoices_spec.rb
index e57f83f350..b5ade9edc9 100644
--- a/spec/system/admin/orders/invoices_spec.rb
+++ b/spec/system/admin/orders/invoices_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
  As an administrator
  I want to manage invoices for an order
 ', feature: :invoices do
diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb
index d7b4ca715f..a2ce6a82a0 100644
--- a/spec/system/admin/orders_spec.rb
+++ b/spec/system/admin/orders_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want to manage orders
 ' do
diff --git a/spec/system/admin/overview_spec.rb b/spec/system/admin/overview_spec.rb
index da77a83e39..9660f812eb 100644
--- a/spec/system/admin/overview_spec.rb
+++ b/spec/system/admin/overview_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
   As a backend user
   I want to be given information about the state of my enterprises, products and order cycles
 ' do
diff --git a/spec/system/admin/payment_method_spec.rb b/spec/system/admin/payment_method_spec.rb
index c7173c5d23..7dd66633a7 100644
--- a/spec/system/admin/payment_method_spec.rb
+++ b/spec/system/admin/payment_method_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As a Super Admin
     I want to be able to set a distributor on each payment method
 ' do
diff --git a/spec/system/admin/payments_spec.rb b/spec/system/admin/payments_spec.rb
index e648c5698f..c7a1afeef2 100644
--- a/spec/system/admin/payments_spec.rb
+++ b/spec/system/admin/payments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an admin
     I want to manage payments
 ' do
diff --git a/spec/system/admin/payments_stripe_spec.rb b/spec/system/admin/payments_stripe_spec.rb
index 0d648250ae..deef52735b 100644
--- a/spec/system/admin/payments_stripe_spec.rb
+++ b/spec/system/admin/payments_stripe_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an hub manager
     I want to make Stripe payments
 ' do
diff --git a/spec/system/admin/product_import_spec.rb b/spec/system/admin/product_import_spec.rb
index 6cc91970a6..21104c4fd5 100644
--- a/spec/system/admin/product_import_spec.rb
+++ b/spec/system/admin/product_import_spec.rb
@@ -3,7 +3,7 @@
 require 'system_helper'
 require 'open_food_network/permissions'
 
-describe "Product Import" do
+RSpec.describe "Product Import" do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
diff --git a/spec/system/admin/products_spec.rb b/spec/system/admin/products_spec.rb
index 55e15a3e41..e75f4bf3dd 100644
--- a/spec/system/admin/products_spec.rb
+++ b/spec/system/admin/products_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an admin
     I want to set a supplier and distributor(s) for a product
 ' do
diff --git a/spec/system/admin/products_v3/products_spec.rb b/spec/system/admin/products_v3/products_spec.rb
index 0eff69cde8..2f216b8f0b 100644
--- a/spec/system/admin/products_v3/products_spec.rb
+++ b/spec/system/admin/products_v3/products_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe 'As an enterprise user, I can manage my products', feature: :admin_style_v3 do
+RSpec.describe 'As an enterprise user, I can manage my products', feature: :admin_style_v3 do
   include WebHelper
   include AuthenticationHelper
   include FileHelper
diff --git a/spec/system/admin/properties_spec.rb b/spec/system/admin/properties_spec.rb
index 21ca9ff919..fe3c2d2e50 100644
--- a/spec/system/admin/properties_spec.rb
+++ b/spec/system/admin/properties_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an admin
     I want to manage product properties
 ' do
diff --git a/spec/system/admin/reports/enterprise_fee_summaries_spec.rb b/spec/system/admin/reports/enterprise_fee_summaries_spec.rb
index 5e44a321ab..4d1b70fee7 100644
--- a/spec/system/admin/reports/enterprise_fee_summaries_spec.rb
+++ b/spec/system/admin/reports/enterprise_fee_summaries_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "enterprise fee summaries" do
+RSpec.describe "enterprise fee summaries" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb
index bd833db5d8..fb80e2b510 100644
--- a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb
+++ b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Enterprise Summary Fee with Tax Report By Order" do
+RSpec.describe "Enterprise Summary Fee with Tax Report By Order" do
   #   1 order cycle the has:
   #     - coordinator fees price 20
   #     - incoming exchange fees 15
diff --git a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb
index d31796eea4..bdab8ac972 100644
--- a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb
+++ b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Enterprise Summary Fee with Tax Report By Producer" do
+RSpec.describe "Enterprise Summary Fee with Tax Report By Producer" do
   #   1 order cycle has:
   #     - coordinator fees price 20
   #     - incoming exchange fees 15
diff --git a/spec/system/admin/reports/orders_and_fulfillment_spec.rb b/spec/system/admin/reports/orders_and_fulfillment_spec.rb
index f96ddf89d5..4be6589234 100644
--- a/spec/system/admin/reports/orders_and_fulfillment_spec.rb
+++ b/spec/system/admin/reports/orders_and_fulfillment_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Orders And Fulfillment" do
+RSpec.describe "Orders And Fulfillment" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/reports/packing_report_spec.rb b/spec/system/admin/reports/packing_report_spec.rb
index f1117e5dee..04f2f82a49 100644
--- a/spec/system/admin/reports/packing_report_spec.rb
+++ b/spec/system/admin/reports/packing_report_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Packing Reports" do
+RSpec.describe "Packing Reports" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/reports/payments_report_spec.rb b/spec/system/admin/reports/payments_report_spec.rb
index 762d3a5215..ad220e6acc 100644
--- a/spec/system/admin/reports/payments_report_spec.rb
+++ b/spec/system/admin/reports/payments_report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Payments Reports" do
+RSpec.describe "Payments Reports" do
   include AuthenticationHelper
 
   let(:order) do
diff --git a/spec/system/admin/reports/revenues_by_hub_spec.rb b/spec/system/admin/reports/revenues_by_hub_spec.rb
index 8d950901cb..71ce4386c9 100644
--- a/spec/system/admin/reports/revenues_by_hub_spec.rb
+++ b/spec/system/admin/reports/revenues_by_hub_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Revenues By Hub Reports" do
+RSpec.describe "Revenues By Hub Reports" do
   include AuthenticationHelper
 
   let(:order) do
diff --git a/spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb b/spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb
index 1ff6b557b0..b186182669 100644
--- a/spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb
+++ b/spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Sales Tax Totals By order" do
+RSpec.describe "Sales Tax Totals By order" do
   #  Scenarion 1: added tax
   #  1 producer
   #  1 distributor
diff --git a/spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb b/spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb
index da3244cef5..e896d23a14 100644
--- a/spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb
+++ b/spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Sales Tax Totals By Producer" do
+RSpec.describe "Sales Tax Totals By Producer" do
   #  Scenario 1: added tax
   #  1 producer
   #  1 distributor
diff --git a/spec/system/admin/reports/users_and_enterprises_spec.rb b/spec/system/admin/reports/users_and_enterprises_spec.rb
index e54c1c8e32..64ad6c04e7 100644
--- a/spec/system/admin/reports/users_and_enterprises_spec.rb
+++ b/spec/system/admin/reports/users_and_enterprises_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Users & Enterprises reports" do
+RSpec.describe "Users & Enterprises reports" do
   include AuthenticationHelper
 
   before do
diff --git a/spec/system/admin/reports_spec.rb b/spec/system/admin/reports_spec.rb
index abe26647c7..a8de146328 100644
--- a/spec/system/admin/reports_spec.rb
+++ b/spec/system/admin/reports_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe '
+RSpec.describe '
     As an administrator
     I want numbers, all the numbers!
 ' do
diff --git a/spec/system/admin/schedules_spec.rb b/spec/system/admin/schedules_spec.rb
index 8832f34d66..383e26d931 100644
--- a/spec/system/admin/schedules_spec.rb
+++ b/spec/system/admin/schedules_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Schedules' do
+RSpec.describe 'Schedules' do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/shipping_methods_spec.rb b/spec/system/admin/shipping_methods_spec.rb
index 2bcc1f142c..6a4e7abad7 100644
--- a/spec/system/admin/shipping_methods_spec.rb
+++ b/spec/system/admin/shipping_methods_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'shipping methods' do
+RSpec.describe 'shipping methods' do
   include WebHelper
   include AuthenticationHelper
 
diff --git a/spec/system/admin/subscriptions/crud_spec.rb b/spec/system/admin/subscriptions/crud_spec.rb
index 8882defc20..91e9467216 100644
--- a/spec/system/admin/subscriptions/crud_spec.rb
+++ b/spec/system/admin/subscriptions/crud_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Subscriptions' do
+RSpec.describe 'Subscriptions' do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
diff --git a/spec/system/admin/subscriptions/smoke_tests_spec.rb b/spec/system/admin/subscriptions/smoke_tests_spec.rb
index 348721ac33..feb905a1aa 100644
--- a/spec/system/admin/subscriptions/smoke_tests_spec.rb
+++ b/spec/system/admin/subscriptions/smoke_tests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Subscriptions' do
+RSpec.describe 'Subscriptions' do
   include AdminHelper
   include AuthenticationHelper
   include WebHelper
diff --git a/spec/system/admin/tag_rules_spec.rb b/spec/system/admin/tag_rules_spec.rb
index 72603632a6..f369fcc94d 100644
--- a/spec/system/admin/tag_rules_spec.rb
+++ b/spec/system/admin/tag_rules_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Tag Rules' do
+RSpec.describe 'Tag Rules' do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/tax_settings_spec.rb b/spec/system/admin/tax_settings_spec.rb
index 5a7392626e..7b84c5d960 100644
--- a/spec/system/admin/tax_settings_spec.rb
+++ b/spec/system/admin/tax_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Account and Billing Settings' do
+RSpec.describe 'Account and Billing Settings' do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/admin/tos_banner_spec.rb b/spec/system/admin/tos_banner_spec.rb
index 8fe256558b..867af24fae 100644
--- a/spec/system/admin/tos_banner_spec.rb
+++ b/spec/system/admin/tos_banner_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Terms of Service banner' do
+RSpec.describe 'Terms of Service banner' do
   include AuthenticationHelper
   include FileHelper
 
diff --git a/spec/system/admin/unit_price_spec.rb b/spec/system/admin/unit_price_spec.rb
index 31070ac421..3c82f76c40 100644
--- a/spec/system/admin/unit_price_spec.rb
+++ b/spec/system/admin/unit_price_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an admin
     I want to check the unit price of my products/variants
 ' do
diff --git a/spec/system/admin/users_spec.rb b/spec/system/admin/users_spec.rb
index 5d3a6f9046..6548dbc558 100644
--- a/spec/system/admin/users_spec.rb
+++ b/spec/system/admin/users_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Managing users" do
+RSpec.describe "Managing users" do
   include AuthenticationHelper
 
   context "as super-admin" do
diff --git a/spec/system/admin/variant_overrides_spec.rb b/spec/system/admin/variant_overrides_spec.rb
index 2da4bf705a..9e5554bc92 100644
--- a/spec/system/admin/variant_overrides_spec.rb
+++ b/spec/system/admin/variant_overrides_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "
+RSpec.describe "
   Managing a hub's inventory
   I want to override the stock level and price of products
   Without affecting other hubs that share the same products
diff --git a/spec/system/admin/variants_spec.rb b/spec/system/admin/variants_spec.rb
index 754670b542..beb164fe1e 100644
--- a/spec/system/admin/variants_spec.rb
+++ b/spec/system/admin/variants_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an admin
     I want to manage product variants
 ' do
diff --git a/spec/system/admin/vouchers_spec.rb b/spec/system/admin/vouchers_spec.rb
index c6893de80f..2673cb2403 100644
--- a/spec/system/admin/vouchers_spec.rb
+++ b/spec/system/admin/vouchers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As an entreprise user
     I want to manage vouchers
 ' do
diff --git a/spec/system/consumer/account/cards_spec.rb b/spec/system/consumer/account/cards_spec.rb
index a4228031b6..58764598c9 100644
--- a/spec/system/consumer/account/cards_spec.rb
+++ b/spec/system/consumer/account/cards_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Credit Cards" do
+RSpec.describe "Credit Cards" do
   include AuthenticationHelper
   include StripeHelper
   include StripeStubs
diff --git a/spec/system/consumer/account/developer_settings_spec.rb b/spec/system/consumer/account/developer_settings_spec.rb
index 704a4a986e..06b204d762 100644
--- a/spec/system/consumer/account/developer_settings_spec.rb
+++ b/spec/system/consumer/account/developer_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Developer Settings" do
+RSpec.describe "Developer Settings" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/consumer/account/payments_spec.rb b/spec/system/consumer/account/payments_spec.rb
index b88a3932f5..0efbf46c13 100644
--- a/spec/system/consumer/account/payments_spec.rb
+++ b/spec/system/consumer/account/payments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Payments requiring action" do
+RSpec.describe "Payments requiring action" do
   include AuthenticationHelper
 
   describe "as a logged in user" do
diff --git a/spec/system/consumer/account/settings_spec.rb b/spec/system/consumer/account/settings_spec.rb
index d20e870db9..58a49c2b2d 100644
--- a/spec/system/consumer/account/settings_spec.rb
+++ b/spec/system/consumer/account/settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Account Settings" do
+RSpec.describe "Account Settings" do
   include AuthenticationHelper
 
   describe "as a logged in user" do
diff --git a/spec/system/consumer/account_spec.rb b/spec/system/consumer/account_spec.rb
index d50ced38a0..ed984f3452 100644
--- a/spec/system/consumer/account_spec.rb
+++ b/spec/system/consumer/account_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As a consumer
     I want to view my order history with each hub
     and view any outstanding balance.
diff --git a/spec/system/consumer/authentication_spec.rb b/spec/system/consumer/authentication_spec.rb
index 7062d99a2e..196425e9d5 100644
--- a/spec/system/consumer/authentication_spec.rb
+++ b/spec/system/consumer/authentication_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Authentication" do
+RSpec.describe "Authentication" do
   include AuthenticationHelper
   include UIComponentHelper
 
diff --git a/spec/system/consumer/caching/darkswarm_caching_spec.rb b/spec/system/consumer/caching/darkswarm_caching_spec.rb
index eea29f8cb2..02c2fdad65 100644
--- a/spec/system/consumer/caching/darkswarm_caching_spec.rb
+++ b/spec/system/consumer/caching/darkswarm_caching_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Darkswarm data caching", caching: true do
+RSpec.describe "Darkswarm data caching", caching: true do
   let!(:taxon) { create(:taxon, name: "Cached Taxon") }
   let!(:property) { create(:property, presentation: "Cached Property") }
 
diff --git a/spec/system/consumer/caching/shops_caching_spec.rb b/spec/system/consumer/caching/shops_caching_spec.rb
index b44a8f77bc..baaf3302e3 100644
--- a/spec/system/consumer/caching/shops_caching_spec.rb
+++ b/spec/system/consumer/caching/shops_caching_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Shops caching", caching: true do
+RSpec.describe "Shops caching", caching: true do
   include WebHelper
   include UIComponentHelper
 
diff --git a/spec/system/consumer/checkout/details_spec.rb b/spec/system/consumer/checkout/details_spec.rb
index 6f83576155..7c970196be 100644
--- a/spec/system/consumer/checkout/details_spec.rb
+++ b/spec/system/consumer/checkout/details_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to checkout my order" do
+RSpec.describe "As a consumer, I want to checkout my order" do
   include ShopWorkflow
   include CheckoutHelper
   include FileHelper
diff --git a/spec/system/consumer/checkout/guest_spec.rb b/spec/system/consumer/checkout/guest_spec.rb
index 303d10c7fc..bf24547115 100644
--- a/spec/system/consumer/checkout/guest_spec.rb
+++ b/spec/system/consumer/checkout/guest_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to checkout my order" do
+RSpec.describe "As a consumer, I want to checkout my order" do
   include ShopWorkflow
   include CheckoutHelper
   include FileHelper
diff --git a/spec/system/consumer/checkout/payment_spec.rb b/spec/system/consumer/checkout/payment_spec.rb
index 0646e40185..e9a1c83609 100644
--- a/spec/system/consumer/checkout/payment_spec.rb
+++ b/spec/system/consumer/checkout/payment_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to checkout my order" do
+RSpec.describe "As a consumer, I want to checkout my order" do
   include ShopWorkflow
   include CheckoutHelper
   include FileHelper
diff --git a/spec/system/consumer/checkout/summary_spec.rb b/spec/system/consumer/checkout/summary_spec.rb
index 1b27719717..75a1a06487 100644
--- a/spec/system/consumer/checkout/summary_spec.rb
+++ b/spec/system/consumer/checkout/summary_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to checkout my order" do
+RSpec.describe "As a consumer, I want to checkout my order" do
   include ShopWorkflow
   include CheckoutHelper
   include FileHelper
diff --git a/spec/system/consumer/checkout/tax_incl_spec.rb b/spec/system/consumer/checkout/tax_incl_spec.rb
index e0d1713a1d..b8b9ff5b7e 100644
--- a/spec/system/consumer/checkout/tax_incl_spec.rb
+++ b/spec/system/consumer/checkout/tax_incl_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to see adjustment breakdown" do
+RSpec.describe "As a consumer, I want to see adjustment breakdown" do
   include ShopWorkflow
   include CheckoutHelper
   include CheckoutRequestsHelper
diff --git a/spec/system/consumer/checkout/tax_not_incl_spec.rb b/spec/system/consumer/checkout/tax_not_incl_spec.rb
index aa746adad6..274480300e 100644
--- a/spec/system/consumer/checkout/tax_not_incl_spec.rb
+++ b/spec/system/consumer/checkout/tax_not_incl_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "As a consumer, I want to see adjustment breakdown" do
+RSpec.describe "As a consumer, I want to see adjustment breakdown" do
   include ShopWorkflow
   include CheckoutHelper
   include CheckoutRequestsHelper
diff --git a/spec/system/consumer/cookies_spec.rb b/spec/system/consumer/cookies_spec.rb
index 7685ab1cfa..e97d900973 100644
--- a/spec/system/consumer/cookies_spec.rb
+++ b/spec/system/consumer/cookies_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Cookies", caching: true do
+RSpec.describe "Cookies", caching: true do
   describe "banner" do
     # keeps banner toggle config unchanged
     around do |example|
diff --git a/spec/system/consumer/footer_links_spec.rb b/spec/system/consumer/footer_links_spec.rb
index af61a4bba9..b686779e82 100644
--- a/spec/system/consumer/footer_links_spec.rb
+++ b/spec/system/consumer/footer_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Footer Links" do
+RSpec.describe "Footer Links" do
   describe "policy link" do
     it "showing" do
       visit root_path
diff --git a/spec/system/consumer/groups_spec.rb b/spec/system/consumer/groups_spec.rb
index 93734d88db..6820ad1b9c 100644
--- a/spec/system/consumer/groups_spec.rb
+++ b/spec/system/consumer/groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Groups' do
+RSpec.describe 'Groups' do
   include AuthenticationHelper
   include UIComponentHelper
 
diff --git a/spec/system/consumer/multilingual_spec.rb b/spec/system/consumer/multilingual_spec.rb
index b50b51f77d..7116c0c1de 100644
--- a/spec/system/consumer/multilingual_spec.rb
+++ b/spec/system/consumer/multilingual_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Multilingual' do
+RSpec.describe 'Multilingual' do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/producers_spec.rb b/spec/system/consumer/producers_spec.rb
index 36ccd65a47..48832fbd62 100644
--- a/spec/system/consumer/producers_spec.rb
+++ b/spec/system/consumer/producers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe '
+RSpec.describe '
     As a consumer
     I want to see a list of producers
     So that I can shop at hubs distributing their products
diff --git a/spec/system/consumer/registration_spec.rb b/spec/system/consumer/registration_spec.rb
index e95c69812a..ad37f4a8c1 100644
--- a/spec/system/consumer/registration_spec.rb
+++ b/spec/system/consumer/registration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Registration" do
+RSpec.describe "Registration" do
   include AuthenticationHelper
   include WebHelper
 
diff --git a/spec/system/consumer/shopping/cart_spec.rb b/spec/system/consumer/shopping/cart_spec.rb
index 3cd4150e2a..5ad9edef83 100644
--- a/spec/system/consumer/shopping/cart_spec.rb
+++ b/spec/system/consumer/shopping/cart_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "full-page cart" do
+RSpec.describe "full-page cart" do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/shopping/checkout_auth_spec.rb b/spec/system/consumer/shopping/checkout_auth_spec.rb
index 0b12d7ff0d..0e3ea887f7 100644
--- a/spec/system/consumer/shopping/checkout_auth_spec.rb
+++ b/spec/system/consumer/shopping/checkout_auth_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "As a consumer I want to check out my cart" do
+RSpec.describe "As a consumer I want to check out my cart" do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/shopping/checkout_paypal_spec.rb b/spec/system/consumer/shopping/checkout_paypal_spec.rb
index aea7807324..07bc98c309 100644
--- a/spec/system/consumer/shopping/checkout_paypal_spec.rb
+++ b/spec/system/consumer/shopping/checkout_paypal_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "Check out with Paypal" do
+RSpec.describe "Check out with Paypal" do
   include ShopWorkflow
   include CheckoutRequestsHelper
   include AuthenticationHelper
diff --git a/spec/system/consumer/shopping/checkout_stripe_spec.rb b/spec/system/consumer/shopping/checkout_stripe_spec.rb
index 28b184b7d1..7758f582db 100644
--- a/spec/system/consumer/shopping/checkout_stripe_spec.rb
+++ b/spec/system/consumer/shopping/checkout_stripe_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Check out with Stripe" do
+RSpec.describe "Check out with Stripe" do
   include AuthenticationHelper
   include ShopWorkflow
   include CheckoutRequestsHelper
diff --git a/spec/system/consumer/shopping/embedded_groups_spec.rb b/spec/system/consumer/shopping/embedded_groups_spec.rb
index f157b2cd69..b59f59ca3c 100644
--- a/spec/system/consumer/shopping/embedded_groups_spec.rb
+++ b/spec/system/consumer/shopping/embedded_groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Using embedded shopfront functionality" do
+RSpec.describe "Using embedded shopfront functionality" do
   include OpenFoodNetwork::EmbeddedPagesHelper
 
   describe 'embedded groups' do
diff --git a/spec/system/consumer/shopping/orders_spec.rb b/spec/system/consumer/shopping/orders_spec.rb
index 0aaf4e4cc7..590ad801e6 100644
--- a/spec/system/consumer/shopping/orders_spec.rb
+++ b/spec/system/consumer/shopping/orders_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "Order Management" do
+RSpec.describe "Order Management" do
   include AuthenticationHelper
 
   describe "viewing a completed order" do
diff --git a/spec/system/consumer/shopping/products_spec.rb b/spec/system/consumer/shopping/products_spec.rb
index fdef556152..81a21613be 100644
--- a/spec/system/consumer/shopping/products_spec.rb
+++ b/spec/system/consumer/shopping/products_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "As a consumer I want to view products" do
+RSpec.describe "As a consumer I want to view products" do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/shopping/shopping_spec.rb b/spec/system/consumer/shopping/shopping_spec.rb
index 9694059eb1..7868c73382 100644
--- a/spec/system/consumer/shopping/shopping_spec.rb
+++ b/spec/system/consumer/shopping/shopping_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "As a consumer I want to shop with a distributor" do
+RSpec.describe "As a consumer I want to shop with a distributor" do
   include AuthenticationHelper
   include FileHelper
   include WebHelper
diff --git a/spec/system/consumer/shopping/unit_price_spec.rb b/spec/system/consumer/shopping/unit_price_spec.rb
index de195c1159..85da774add 100644
--- a/spec/system/consumer/shopping/unit_price_spec.rb
+++ b/spec/system/consumer/shopping/unit_price_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "As a consumer, I want to check unit price information for a product" do
+RSpec.describe "As a consumer, I want to check unit price information for a product" do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/shopping/variant_overrides_spec.rb b/spec/system/consumer/shopping/variant_overrides_spec.rb
index 20ef2a5122..90c24666d0 100644
--- a/spec/system/consumer/shopping/variant_overrides_spec.rb
+++ b/spec/system/consumer/shopping/variant_overrides_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe "shopping with variant overrides defined" do
+RSpec.describe "shopping with variant overrides defined" do
   include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
diff --git a/spec/system/consumer/shops_spec.rb b/spec/system/consumer/shops_spec.rb
index 02fccfd130..d36a9ca6c1 100644
--- a/spec/system/consumer/shops_spec.rb
+++ b/spec/system/consumer/shops_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'Shops' do
+RSpec.describe 'Shops' do
   include AuthenticationHelper
   include UIComponentHelper
   include WebHelper
diff --git a/spec/system/consumer/sitemap_spec.rb b/spec/system/consumer/sitemap_spec.rb
index 93b3ebe655..255606c2ae 100644
--- a/spec/system/consumer/sitemap_spec.rb
+++ b/spec/system/consumer/sitemap_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'sitemap' do
+RSpec.describe 'sitemap' do
   let(:enterprise) { create(:distributor_enterprise) }
   let!(:group) { create(:enterprise_group, enterprises: [enterprise], on_front_page: true) }
 
diff --git a/spec/system/consumer/user_password_spec.rb b/spec/system/consumer/user_password_spec.rb
index a744aac85c..6638541b97 100644
--- a/spec/system/consumer/user_password_spec.rb
+++ b/spec/system/consumer/user_password_spec.rb
@@ -2,7 +2,7 @@
 
 require "system_helper"
 
-describe "User password confirm/reset page" do
+RSpec.describe "User password confirm/reset page" do
   include UIComponentHelper
 
   let(:email) { "test@example.org" }
diff --git a/spec/system/consumer/white_label_spec.rb b/spec/system/consumer/white_label_spec.rb
index 6fe7645ec6..73aa8065a9 100644
--- a/spec/system/consumer/white_label_spec.rb
+++ b/spec/system/consumer/white_label_spec.rb
@@ -2,7 +2,7 @@
 
 require 'system_helper'
 
-describe 'White label setting' do
+RSpec.describe 'White label setting' do
   include AuthenticationHelper
   include ShopWorkflow
   include FileHelper
diff --git a/spec/validators/date_time_string_validator_spec.rb b/spec/validators/date_time_string_validator_spec.rb
index a4b5d7a468..17539a42ab 100644
--- a/spec/validators/date_time_string_validator_spec.rb
+++ b/spec/validators/date_time_string_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe DateTimeStringValidator do
+RSpec.describe DateTimeStringValidator do
   describe "internationalization" do
     it "has translation for NOT_STRING_ERROR" do
       expect(described_class.not_string_error).not_to be_blank
diff --git a/spec/validators/integer_array_validator_spec.rb b/spec/validators/integer_array_validator_spec.rb
index 0643d02806..fc447f7df2 100644
--- a/spec/validators/integer_array_validator_spec.rb
+++ b/spec/validators/integer_array_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe IntegerArrayValidator do
+RSpec.describe IntegerArrayValidator do
   describe "internationalization" do
     it "has translation for NOT_ARRAY_ERROR" do
       expect(described_class.not_array_error).not_to be_blank
diff --git a/spec/views/admin/products_v3/_filters.html.haml_spec.rb b/spec/views/admin/products_v3/_filters.html.haml_spec.rb
index b9ae7725c2..7eff206b7e 100644
--- a/spec/views/admin/products_v3/_filters.html.haml_spec.rb
+++ b/spec/views/admin/products_v3/_filters.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "admin/products_v3/_filters.html.haml" do
+RSpec.describe "admin/products_v3/_filters.html.haml" do
   subject { render }
 
   let(:locals) do
diff --git a/spec/views/checkout/_voucher_section.html.haml_spec.rb b/spec/views/checkout/_voucher_section.html.haml_spec.rb
index 36aa3e0776..f60d80d03b 100644
--- a/spec/views/checkout/_voucher_section.html.haml_spec.rb
+++ b/spec/views/checkout/_voucher_section.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "checkout/_voucher_section.html.haml" do
+RSpec.describe "checkout/_voucher_section.html.haml" do
   let(:order) { create(:order_with_distributor, total: 10) }
   let(:flat_voucher) {
     create(:voucher_flat_rate, code: "flat_code",
diff --git a/spec/views/layouts/darkswarm.html.haml_spec.rb b/spec/views/layouts/darkswarm.html.haml_spec.rb
index 8cf60679df..286f301a94 100644
--- a/spec/views/layouts/darkswarm.html.haml_spec.rb
+++ b/spec/views/layouts/darkswarm.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "layouts/darkswarm.html.haml" do
+RSpec.describe "layouts/darkswarm.html.haml" do
   helper InjectionHelper
   helper I18nHelper
   helper ShopHelper
diff --git a/spec/views/layouts/registration.html.haml_spec.rb b/spec/views/layouts/registration.html.haml_spec.rb
index 9beac670a7..07eac91486 100644
--- a/spec/views/layouts/registration.html.haml_spec.rb
+++ b/spec/views/layouts/registration.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "layouts/registration.html.haml" do
+RSpec.describe "layouts/registration.html.haml" do
   helper InjectionHelper
   helper I18nHelper
   helper ShopHelper
diff --git a/spec/views/spree/admin/orders/edit.html.haml_spec.rb b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
index 9376b9188e..644af45b88 100644
--- a/spec/views/spree/admin/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/admin/orders/edit.html.haml" do
+RSpec.describe "spree/admin/orders/edit.html.haml" do
   helper Spree::BaseHelper # required to make pretty_time work
   helper Spree::Admin::NavigationHelper
   helper Admin::InjectionHelper
diff --git a/spec/views/spree/admin/orders/index.html.haml_spec.rb b/spec/views/spree/admin/orders/index.html.haml_spec.rb
index 04641e5159..c28da03214 100644
--- a/spec/views/spree/admin/orders/index.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/index.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/admin/orders/index.html.haml" do
+RSpec.describe "spree/admin/orders/index.html.haml" do
   helper Spree::Admin::NavigationHelper
   helper EnterprisesHelper
 
diff --git a/spec/views/spree/admin/orders/invoice.html.haml_spec.rb b/spec/views/spree/admin/orders/invoice.html.haml_spec.rb
index c76950e869..a49b25d426 100644
--- a/spec/views/spree/admin/orders/invoice.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/invoice.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/admin/orders/invoice.html.haml" do
+RSpec.describe "spree/admin/orders/invoice.html.haml" do
   let(:shop) { create(:distributor_enterprise) }
   let(:order) { create(:completed_order_with_totals, distributor: shop) }
   let(:adas_address) do
diff --git a/spec/views/spree/admin/payment_methods/index.html.haml_spec.rb b/spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
index e5f1f2def3..95ee8a0ab5 100644
--- a/spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
+++ b/spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/admin/payment_methods/index.html.haml" do
+RSpec.describe "spree/admin/payment_methods/index.html.haml" do
   include AuthenticationHelper
   helper Spree::Admin::NavigationHelper
   helper Spree::Admin::BaseHelper
diff --git a/spec/views/spree/orders/edit.html.haml_spec.rb b/spec/views/spree/orders/edit.html.haml_spec.rb
index 421d7c535b..cb1186592b 100644
--- a/spec/views/spree/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/orders/edit.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/orders/edit.html.haml" do
+RSpec.describe "spree/orders/edit.html.haml" do
   helper InjectionHelper
   helper ShopHelper
   helper ApplicationHelper
diff --git a/spec/views/spree/orders/show.html.haml_spec.rb b/spec/views/spree/orders/show.html.haml_spec.rb
index 6ce839a6e8..a1d238f472 100644
--- a/spec/views/spree/orders/show.html.haml_spec.rb
+++ b/spec/views/spree/orders/show.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/orders/show.html.haml" do
+RSpec.describe "spree/orders/show.html.haml" do
   helper InjectionHelper
   helper ShopHelper
   helper ApplicationHelper
diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb
index 0224bdc37a..3acc484f0e 100644
--- a/spec/views/spree/shared/_order_details.html.haml_spec.rb
+++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "spree/shared/_order_details.html.haml" do
+RSpec.describe "spree/shared/_order_details.html.haml" do
   include AuthenticationHelper
   helper Spree::BaseHelper
   helper CheckoutHelper