From eaacaf42aa6e77fa4817751ef2f6525a6a93d333 Mon Sep 17 00:00:00 2001
From: David Cook <david@redcliffs.net>
Date: Wed, 6 Sep 2023 12:13:11 +1000
Subject: [PATCH] Enforce block style for rspec .change

As discussed in https://github.com/openfoodfoundation/openfoodnetwork/pull/11208#discussion_r1280049281
---
 .rubocop_styleguide.yml |  4 +++
 .rubocop_todo.yml       | 70 +++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/.rubocop_styleguide.yml b/.rubocop_styleguide.yml
index 3fc2a87938..baa4c15555 100644
--- a/.rubocop_styleguide.yml
+++ b/.rubocop_styleguide.yml
@@ -125,6 +125,10 @@ Rails/SkipsModelValidations:
     - update_column
     - update_columns
 
+RSpec/ExpectChange:
+  Enabled: true
+  EnforcedStyle: block
+
 RSpec/MultipleExpectations:
   Max: 5 # Default 1
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9d154ed762..ce0f409c66 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -2149,57 +2149,43 @@ RSpec/ExcessiveDocstringSpacing:
     - 'spec/system/admin/enterprises/business_address_form_spec.rb'
     - 'spec/system/admin/order_spec.rb'
 
-# Offense count: 132
+# Offense count: 110
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: method_call, block
 RSpec/ExpectChange:
   Exclude:
-    - 'engines/dfc_provider/spec/requests/catalog_items_spec.rb'
-    - 'engines/dfc_provider/spec/requests/offers_spec.rb'
-    - 'engines/dfc_provider/spec/requests/supplied_products_spec.rb'
-    - 'engines/order_management/spec/services/order_management/order/updater_spec.rb'
-    - 'spec/controllers/admin/enterprises_controller_spec.rb'
-    - 'spec/controllers/admin/inventory_items_controller_spec.rb'
-    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
-    - 'spec/controllers/admin/tag_rules_controller_spec.rb'
-    - 'spec/controllers/api/v0/enterprise_fees_controller_spec.rb'
-    - 'spec/controllers/base_controller_spec.rb'
-    - 'spec/controllers/payment_gateways/stripe_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders/invoices_spec.rb'
-    - 'spec/controllers/spree/admin/shipping_categories_controller_spec.rb'
-    - 'spec/controllers/spree/api_keys_controller_spec.rb'
-    - 'spec/jobs/report_job_spec.rb'
-    - 'spec/jobs/subscription_placement_job_spec.rb'
-    - 'spec/lib/open_food_network/feature_toggle_spec.rb'
-    - 'spec/migrations/20240213044159_copy_oidc_data_to_oidc_accounts_spec.rb'
-    - 'spec/migrations/migrate_admin_tax_amounts_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb'
+    - 'spec/controllers/admin/customers_controller_spec.rb'
+    - 'spec/controllers/admin/order_cycles_controller_spec.rb'
+    - 'spec/controllers/admin/schedules_controller_spec.rb'
+    - 'spec/controllers/cart_controller_spec.rb'
+    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
+    - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
+    - 'spec/lib/stripe/account_connector_spec.rb'
+    - 'spec/lib/tasks/data/remove_transient_data_spec.rb'
+    - 'spec/lib/tasks/enterprises_rake_spec.rb'
+    - 'spec/mailers/producer_mailer_spec.rb'
+    - 'spec/mailers/user_mailer_spec.rb'
+    - 'spec/models/enterprise_fee_spec.rb'
     - 'spec/models/enterprise_spec.rb'
-    - 'spec/models/oidc_account_spec.rb'
-    - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/spree/adjustment_spec.rb'
-    - 'spec/models/spree/order/state_machine_spec.rb'
+    - 'spec/models/spree/order_contents_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/payment_spec.rb'
     - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/return_authorization_spec.rb'
-    - 'spec/models/spree/variant_spec.rb'
-    - 'spec/reflexes/products_reflex_spec.rb'
-    - 'spec/reflexes/user_reflex_spec.rb'
-    - 'spec/requests/omniauth_callbacks_controller_spec.rb'
-    - 'spec/services/cap_quantity_spec.rb'
-    - 'spec/services/image_importer_spec.rb'
-    - 'spec/services/order_factory_spec.rb'
-    - 'spec/services/order_invoice_comparator_spec.rb'
-    - 'spec/services/order_invoice_generator_spec.rb'
-    - 'spec/services/sets/product_set_spec.rb'
-    - 'spec/system/admin/customers_spec.rb'
-    - 'spec/system/admin/enterprises/index_spec.rb'
-    - 'spec/system/admin/products_v3/products_spec.rb'
-    - 'spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb'
-    - 'spec/system/admin/tag_rules_spec.rb'
-    - 'spec/system/admin/tos_banner_spec.rb'
-    - 'spec/system/admin/users_spec.rb'
+    - 'spec/models/stripe_account_spec.rb'
+    - 'spec/requests/admin/vouchers_spec.rb'
+    - 'spec/services/default_shipping_category_spec.rb'
+    - 'spec/services/default_stock_location_spec.rb'
+    - 'spec/services/order_cycle_form_spec.rb'
+    - 'spec/services/sets/model_set_spec.rb'
+    - 'spec/system/admin/enterprise_relationships_spec.rb'
+    - 'spec/system/admin/enterprise_roles_spec.rb'
+    - 'spec/system/admin/subscriptions/crud_spec.rb'
+    - 'spec/system/admin/subscriptions/smoke_tests_spec.rb'
+    - 'spec/system/admin/variant_overrides_spec.rb'
 
 # Offense count: 113
 RSpec/ExpectInHook: