Merge pull request #6010 from mkllnk/fix-module-declaration

Fix module declaration
2026-02-26 01:33:22 +00:00 · 2020-09-11 09:12:08 +10:00
parent a48b57f7a7 94b903179e
commit dc9e3aa1a0
4 changed files with 169 additions and 126 deletions
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -330,6 +330,13 @@ Layout/LineLength:
  - spec/requests/api/orders_spec.rb
  - spec/swagger_helper.rb
  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
+  - app/models/spree/image.rb
+  - app/models/spree/payment_method.rb
+  - spec/factories/line_item_factory.rb
+  - spec/factories/shipment_factory.rb
+  - spec/factories/stock_location_factory.rb
+  - spec/factories/user_factory.rb
+  - spec/lib/spree/core/calculated_adjustments_spec.rb

 Metrics/AbcSize:
  Max: 15
@@ -459,6 +466,13 @@ Metrics/AbcSize:
  - app/models/spree/payment/processing.rb
  - app/models/spree/payment.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/money.rb
+  - spec/support/i18n_translations_checker.rb

 Metrics/BlockLength:
  Max: 25
@@ -501,6 +515,9 @@ Metrics/BlockLength:
  - app/models/spree/payment/processing.rb
  - spec/requests/api/orders_spec.rb
  - spec/swagger_helper.rb
+  - spec/factories/address_factory.rb
+  - spec/factories/payment_method_factory.rb
+  - spec/factories/shipment_factory.rb

 Metrics/CyclomaticComplexity:
  Max: 6
@@ -535,6 +552,9 @@ Metrics/CyclomaticComplexity:
  - app/models/spree/order/checkout.rb
  - app/models/spree/payment.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb

 Metrics/PerceivedComplexity:
  Max: 7
@@ -563,6 +583,8 @@ Metrics/PerceivedComplexity:
  - spec/models/product_importer_spec.rb
  - app/models/spree/order/checkout.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb

 Metrics/MethodLength:
  Max: 10
@@ -675,6 +697,15 @@ Metrics/MethodLength:
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/responder.rb
+  - spec/support/i18n_translations_checker.rb

 Metrics/ClassLength:
  Max: 100
@@ -719,6 +750,8 @@ Metrics/ClassLength:
  - lib/open_food_network/xero_invoices_report.rb
  - app/models/spree/payment.rb
  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/zone.rb

 Metrics/ModuleLength:
  Max: 100
@@ -764,6 +797,8 @@ Metrics/ModuleLength:
  - spec/support/request/web_helper.rb
  - app/models/spree/order/checkout.rb
  - app/models/spree/payment/processing.rb
+  - spec/lib/open_food_network/packing_report_spec.rb
+  - spec/models/spree/credit_card_spec.rb

 Metrics/ParameterLists:
  Max: 5
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-08-13 16:05:53 +1000 using RuboCop version 0.81.0.
+# on 2020-09-10 16:12:05 +1000 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -28,13 +28,14 @@ Layout/EmptyLines:
  Exclude:
    - 'spec/models/spree/payment_spec.rb'

-# Offense count: 3
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
  Exclude:
    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/models/spree/zone_spec.rb'

 # Offense count: 3
 # Cop supports --auto-correct.
@@ -61,7 +62,7 @@ Layout/FirstHashElementIndentation:
    - 'spec/models/spree/payment_spec.rb'
    - 'spec/swagger_helper.rb'

-# Offense count: 5
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -69,6 +70,7 @@ Layout/FirstHashElementIndentation:
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/HashAlignment:
  Exclude:
+    - 'spec/lib/open_food_network/packing_report_spec.rb'
    - 'spec/models/spree/payment_spec.rb'

 # Offense count: 1
@@ -79,13 +81,6 @@ Layout/IndentationConsistency:
  Exclude:
    - 'spec/models/spree/order/checkout_spec.rb'

-# Offense count: 26
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 409
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -123,13 +118,22 @@ Layout/SpaceInsideHashLiteralBraces:
    - 'spec/services/checkout/form_data_adapter_spec.rb'
    - 'spec/services/user_locale_setter_spec.rb'

+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/factories.rb'
+    - 'spec/factories/address_factory.rb'
+
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
  Exclude:
-    - 'spec/controllers/base_controller2_spec.rb'
    - 'spec/features/consumer/shopping/shopping_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb'
    - 'spec/requests/api/orders_spec.rb'

 # Offense count: 2
@@ -145,6 +149,13 @@ Lint/IneffectiveAccessModifier:
    - 'app/services/mail_configuration.rb'
    - 'lib/open_food_network/feature_toggle.rb'

+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
@@ -160,48 +171,6 @@ Lint/UselessAccessModifier:
    - 'app/services/mail_configuration.rb'
    - 'lib/open_food_network/feature_toggle.rb'

-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/spree/core/controller_helpers/common.rb'
-
-# Offense count: 19
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 126
-
-# Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 102
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 231
-
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 23
-
-# Offense count: 19
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 140
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 208
-
-# Offense count: 2
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 24
-
 # Offense count: 9
 Naming/AccessorMethodName:
  Exclude:
@@ -227,7 +196,7 @@ Naming/MemoizedInstanceVariableName:
    - 'app/mailers/producer_mailer.rb'
    - 'lib/open_food_network/address_finder.rb'

-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -241,9 +210,10 @@ Naming/PredicateName:
    - 'app/models/order_cycle.rb'
    - 'app/models/spree/ability_decorator.rb'
    - 'app/models/spree/adjustment_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
    - 'app/models/spree/line_item_decorator.rb'
    - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
+    - 'app/models/spree/payment_method.rb'
    - 'app/models/spree/preferences/file_configuration.rb'
    - 'app/models/spree/shipping_method_decorator.rb'
    - 'lib/open_food_network/customers_report.rb'
@@ -252,6 +222,13 @@ Naming/PredicateName:
    - 'lib/open_food_network/packing_report.rb'
    - 'lib/tasks/data.rake'

+# Offense count: 2
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: snake_case, normalcase, non_integer
+Naming/VariableNumber:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+
 # Offense count: 7
 # Cop supports --auto-correct.
 Rails/ActiveRecordAliases:
@@ -261,12 +238,13 @@ Rails/ActiveRecordAliases:
    - 'spec/features/consumer/shopping/orders_spec.rb'
    - 'spec/requests/api/orders_spec.rb'

-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/Date:
  Exclude:
    - 'app/models/order_cycle.rb'
+    - 'app/models/spree/credit_card.rb'

 # Offense count: 1
 # Cop supports --auto-correct.
@@ -281,7 +259,7 @@ Rails/Delegate:
 # Whitelist: find_by_sql
 Rails/DynamicFindBy:
  Exclude:
-    - 'app/controllers/spree/admin/orders/customer_details_controller.rb'
+    - 'spec/factories/state_factory.rb'

 # Offense count: 16
 # Configuration parameters: EnforcedStyle.
@@ -323,7 +301,7 @@ Rails/FindEach:
    - 'app/models/spree/order_decorator.rb'
    - 'app/models/spree/shipment.rb'

-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -332,8 +310,9 @@ Rails/HasAndBelongsToMany:
    - 'app/models/enterprise_group.rb'
    - 'app/models/spree/concerns/payment_method_distributors.rb'
    - 'app/models/spree/line_item_decorator.rb'
+    - 'app/models/spree/zone.rb'

-# Offense count: 26
+# Offense count: 27
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -342,8 +321,9 @@ Rails/HasManyOrHasOneDependent:
    - 'app/models/enterprise.rb'
    - 'app/models/order_cycle.rb'
    - 'app/models/spree/adjustment_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
    - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
+    - 'app/models/spree/payment_method.rb'
    - 'app/models/spree/property.rb'
    - 'app/models/spree/shipment.rb'
    - 'app/models/spree/shipping_method_decorator.rb'
@@ -392,7 +372,7 @@ Rails/LexicallyScopedActionFilter:
    - 'app/controllers/spree/users_controller.rb'
    - 'app/controllers/user_passwords_controller.rb'

-# Offense count: 12
+# Offense count: 13
 Rails/OutputSafety:
  Exclude:
    - 'app/controllers/spree/admin/reports_controller.rb'
@@ -403,6 +383,7 @@ Rails/OutputSafety:
    - 'app/helpers/spree/admin/zones_helper.rb'
    - 'app/helpers/spree/reports_helper.rb'
    - 'app/serializers/api/product_serializer.rb'
+    - 'lib/spree/money.rb'
    - 'lib/spree/money_decorator.rb'
    - 'spec/features/admin/order_print_ticket_spec.rb'

@@ -422,7 +403,7 @@ Rails/ReflectionClassName:
    - 'app/models/enterprise_role.rb'
    - 'app/models/subscription.rb'

-# Offense count: 233
+# Offense count: 241
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -439,17 +420,19 @@ Rails/SkipsModelValidations:
    - 'app/models/product_import/inventory_reset_strategy.rb'
    - 'app/models/proxy_order.rb'
    - 'app/models/spree/address_decorator.rb'
-    - 'app/models/spree/credit_card_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
    - 'app/models/spree/order_decorator.rb'
    - 'app/models/spree/payment.rb'
    - 'app/models/spree/shipment.rb'
    - 'app/models/spree/shipping_method_decorator.rb'
+    - 'app/models/spree/zone.rb'
    - 'app/models/subscription.rb'
    - 'app/models/variant_override.rb'
    - 'app/services/order_factory.rb'
    - 'engines/order_management/spec/performance/order_management/subscriptions/proxy_order_syncer_spec.rb'
    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb'
    - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
+    - 'lib/spree/core/calculated_adjustments.rb'
    - 'lib/tasks/data/anonymize_data.rake'
    - 'lib/tasks/sample_data/product_factory.rb'
    - 'lib/tasks/users.rake'
@@ -494,6 +477,7 @@ Rails/SkipsModelValidations:
    - 'spec/models/enterprise_relationship_spec.rb'
    - 'spec/models/exchange_spec.rb'
    - 'spec/models/spree/adjustment_spec.rb'
+    - 'spec/models/spree/asset_spec.rb'
    - 'spec/models/spree/line_item_spec.rb'
    - 'spec/models/spree/order_spec.rb'
    - 'spec/models/spree/variant_spec.rb'
@@ -510,7 +494,7 @@ Rails/SkipsModelValidations:
    - 'spec/support/request/shop_workflow.rb'
    - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'

-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
@@ -518,6 +502,7 @@ Rails/UniqueValidationWithoutIndex:
    - 'app/models/customer.rb'
    - 'app/models/exchange.rb'
    - 'app/models/spree/stock_item.rb'
+    - 'app/models/spree/zone.rb'

 # Offense count: 2
 # Configuration parameters: Environments.
@@ -527,23 +512,29 @@ Rails/UnknownEnv:
    - 'app/models/spree/app_configuration_decorator.rb'
    - 'lib/spree/core/controller_helpers/ssl.rb'

+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Exclude:
+    - 'spec/support/request/web_helper.rb'
+
 # Offense count: 2
 Style/CaseEquality:
  Exclude:
    - 'app/helpers/angular_form_helper.rb'
    - 'spec/models/spree/payment_spec.rb'

-# Offense count: 71
+# Offense count: 64
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
  Exclude:
    - 'app/models/calculator/flat_percent_per_item.rb'
-    - 'app/models/spree/concerns/payment_method_distributors.rb'
    - 'app/models/spree/gateway/migs.rb'
    - 'app/models/spree/gateway/pin.rb'
-    - 'app/models/spree/preferences/file_configuration.rb'
    - 'app/models/spree/product_set.rb'
    - 'app/models/tag_rule/discount_order.rb'
    - 'app/models/tag_rule/filter_order_cycles.rb'
@@ -601,11 +592,13 @@ Style/ClassAndModuleChildren:
    - 'app/serializers/api/variant_serializer.rb'
    - 'lib/open_food_network/locking.rb'
    - 'spec/controllers/spree/admin/base_controller_spec.rb'
+    - 'spec/models/spree/payment_method_spec.rb'

-# Offense count: 2
+# Offense count: 3
 Style/ClassVars:
  Exclude:
    - 'lib/open_food_network/rack_request_blocker.rb'
+    - 'lib/spree/core/delegate_belongs_to.rb'

 # Offense count: 4
 # Configuration parameters: EnforcedStyle.
@@ -615,7 +608,7 @@ Style/FormatStringToken:
    - 'lib/open_food_network/sales_tax_report.rb'
    - 'spec/features/admin/bulk_order_management_spec.rb'

-# Offense count: 847
+# Offense count: 829
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -710,10 +703,6 @@ Style/FrozenStringLiteralComment:
    - 'app/controllers/spree/admin/zones_controller.rb'
    - 'app/controllers/spree/credit_cards_controller.rb'
    - 'app/controllers/spree/orders_controller.rb'
-    - 'app/controllers/spree/store_controller.rb'
-    - 'app/controllers/spree/user_passwords_controller.rb'
-    - 'app/controllers/spree/user_registrations_controller.rb'
-    - 'app/controllers/spree/user_sessions_controller.rb'
    - 'app/controllers/spree/users_controller.rb'
    - 'app/controllers/stripe/callbacks_controller.rb'
    - 'app/controllers/stripe/webhooks_controller.rb'
@@ -781,11 +770,9 @@ Style/FrozenStringLiteralComment:
    - 'app/models/coordinator_fee.rb'
    - 'app/models/customer.rb'
    - 'app/models/distributor_shipping_method.rb'
-    - 'app/models/enterprise.rb'
    - 'app/models/enterprise_fee.rb'
    - 'app/models/enterprise_fee_set.rb'
    - 'app/models/enterprise_group.rb'
-    - 'app/models/enterprise_relationship.rb'
    - 'app/models/enterprise_relationship_permission.rb'
    - 'app/models/enterprise_role.rb'
    - 'app/models/enterprise_set.rb'
@@ -796,7 +783,6 @@ Style/FrozenStringLiteralComment:
    - 'app/models/model_set.rb'
    - 'app/models/order_cycle.rb'
    - 'app/models/order_cycle_set.rb'
-    - 'app/models/order_updater.rb'
    - 'app/models/preference_sections/footer_and_external_links_section.rb'
    - 'app/models/preference_sections/group_signup_page_section.rb'
    - 'app/models/preference_sections/header_section.rb'
@@ -824,16 +810,12 @@ Style/FrozenStringLiteralComment:
    - 'app/models/spree/calculator_decorator.rb'
    - 'app/models/spree/classification_decorator.rb'
    - 'app/models/spree/concerns/payment_method_distributors.rb'
-    - 'app/models/spree/credit_card_decorator.rb'
    - 'app/models/spree/gateway/migs.rb'
    - 'app/models/spree/gateway/pin.rb'
    - 'app/models/spree/gateway/stripe_connect.rb'
-    - 'app/models/spree/gateway_decorator.rb'
-    - 'app/models/spree/image_decorator.rb'
    - 'app/models/spree/line_item_decorator.rb'
    - 'app/models/spree/option_type_decorator.rb'
    - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
    - 'app/models/spree/preferences/file_configuration.rb'
    - 'app/models/spree/price_decorator.rb'
    - 'app/models/spree/product_decorator.rb'
@@ -842,7 +824,6 @@ Style/FrozenStringLiteralComment:
    - 'app/models/spree/product_set.rb'
    - 'app/models/spree/property.rb'
    - 'app/models/spree/shipping_method_decorator.rb'
-    - 'app/models/spree/stock_location_decorator.rb'
    - 'app/models/spree/tax_rate_decorator.rb'
    - 'app/models/spree/taxon_decorator.rb'
    - 'app/models/spree/user.rb'
@@ -1125,7 +1106,6 @@ Style/FrozenStringLiteralComment:
    - 'spec/controllers/api/taxonomies_controller_spec.rb'
    - 'spec/controllers/api/taxons_controller_spec.rb'
    - 'spec/controllers/api/variants_controller_spec.rb'
-    - 'spec/controllers/base_controller2_spec.rb'
    - 'spec/controllers/base_controller_spec.rb'
    - 'spec/controllers/cart_controller_spec.rb'
    - 'spec/controllers/checkout_controller_spec.rb'
@@ -1169,6 +1149,8 @@ Style/FrozenStringLiteralComment:
    - 'spec/factories/product_factory.rb'
    - 'spec/factories/shipment_factory.rb'
    - 'spec/factories/shipping_method_factory.rb'
+    - 'spec/factories/state_factory.rb'
+    - 'spec/factories/stock_movement_factory.rb'
    - 'spec/factories/subscription_factory.rb'
    - 'spec/factories/tag_rule_factory.rb'
    - 'spec/factories/user_factory.rb'
@@ -1323,7 +1305,6 @@ Style/FrozenStringLiteralComment:
    - 'spec/models/exchange_spec.rb'
    - 'spec/models/model_set_spec.rb'
    - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/order_updater_spec.rb'
    - 'spec/models/product_import/entry_processor_spec.rb'
    - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
    - 'spec/models/product_import/reset_absent_spec.rb'
@@ -1461,6 +1442,7 @@ Style/FrozenStringLiteralComment:
    - 'spec/views/spree/admin/orders/edit.html.haml_spec.rb'
    - 'spec/views/spree/admin/orders/index.html.haml_spec.rb'
    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/shared/_order_links.html.haml_spec.rb'

 # Offense count: 48
 # Configuration parameters: MinBodyLength.
@@ -1491,18 +1473,21 @@ Style/GuardClause:
    - 'spec/support/request/distribution_helper.rb'
    - 'spec/support/request/shop_workflow.rb'

-# Offense count: 54
+# Offense count: 66
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+    - 'spec/models/spree/credit_card_spec.rb'
    - 'spec/models/spree/payment_spec.rb'

-# Offense count: 1
+# Offense count: 2
 Style/MissingRespondToMissing:
  Exclude:
    - 'app/helpers/application_helper.rb'
+    - 'app/models/spree/gateway.rb'

 # Offense count: 2
 Style/MixinUsage:
@@ -1510,7 +1495,7 @@ Style/MixinUsage:
    - 'lib/open_food_network/orders_and_fulfillments_report.rb'
    - 'spec/lib/open_food_network/packing_report_spec.rb'

-# Offense count: 39
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1521,7 +1506,6 @@ Style/NumericPredicate:
    - 'app/controllers/spree/orders_controller.rb'
    - 'app/helpers/checkout_helper.rb'
    - 'app/helpers/shared_helper.rb'
-    - 'app/models/order_updater.rb'
    - 'app/models/product_import/product_importer.rb'
    - 'app/models/product_import/spreadsheet_entry.rb'
    - 'app/models/spree/adjustment_decorator.rb'
@@ -1548,6 +1532,18 @@ Style/RaiseArgs:
  Exclude:
    - 'spec/controllers/checkout_controller_spec.rb'

+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RandomWithOffset:
+  Exclude:
+    - 'spec/factories.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantPercentQ:
+  Exclude:
+    - 'spec/support/request/web_helper.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
@@ -1556,6 +1552,14 @@ Style/RegexpLiteral:
  Exclude:
    - 'lib/spree/core/controller_helpers/auth.rb'

+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/spree/core/delegate_belongs_to.rb'
+
 # Offense count: 231
 Style/Send:
  Exclude:
--- a/app/models/spree/concerns/payment_method_distributors.rb
+++ b/app/models/spree/concerns/payment_method_distributors.rb
@@ -3,12 +3,14 @@ require 'active_support/concern'
 # This concern is used to duplicate the associations distributors and distributor_ids
 #   across payment method and gateway
 #   this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
-module Spree::PaymentMethodDistributors
-  extend ActiveSupport::Concern
+module Spree
+  module PaymentMethodDistributors
+    extend ActiveSupport::Concern

-  def self.included(base)
-    base.class_eval do
-      has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods', class_name: 'Enterprise', foreign_key: 'payment_method_id', association_foreign_key: 'distributor_id'
+    def self.included(base)
+      base.class_eval do
+        has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods', class_name: 'Enterprise', foreign_key: 'payment_method_id', association_foreign_key: 'distributor_id'
+      end
    end
  end
 end
--- a/app/models/spree/preferences/file_configuration.rb
+++ b/app/models/spree/preferences/file_configuration.rb
@@ -1,45 +1,47 @@
-module Spree::Preferences
-  class FileConfiguration < Configuration
-    def self.preference(name, type, *args)
-      if type == :file
-        super "#{name}_file_name",    :string,  *args
-        super "#{name}_content_type", :string,  *args
-        super "#{name}_file_size",    :integer, *args
-        super "#{name}_updated_at",   :string,  *args
+module Spree
+  module Preferences
+    class FileConfiguration < Configuration
+      def self.preference(name, type, *args)
+        if type == :file
+          super "#{name}_file_name",    :string,  *args
+          super "#{name}_content_type", :string,  *args
+          super "#{name}_file_size",    :integer, *args
+          super "#{name}_updated_at",   :string,  *args

-      else
-        super name, type, *args
+        else
+          super name, type, *args
+        end
      end
-    end

-    def get_preference(key)
-      if !has_preference?(key) && has_attachment?(key)
-        public_send key
-      else
-        super key
+      def get_preference(key)
+        if !has_preference?(key) && has_attachment?(key)
+          public_send key
+        else
+          super key
+        end
      end
-    end
-    alias :[] :get_preference
+      alias :[] :get_preference

-    def preference_type(name)
-      if has_attachment? name
-        :file
-      else
-        super name
+      def preference_type(name)
+        if has_attachment? name
+          :file
+        else
+          super name
+        end
      end
-    end

-    # Spree's Configuration responds to preference methods via method_missing, but doesn't
-    # override respond_to?, which consequently reports those methods as unavailable. Paperclip
-    # errors if respond_to? isn't correct, so we override it here.
-    def respond_to?(method, include_all = false)
-      name = method.to_s.delete('=')
-      super(self.class.preference_getter_method(name), include_all) || super(method, include_all)
-    end
+      # Spree's Configuration responds to preference methods via method_missing, but doesn't
+      # override respond_to?, which consequently reports those methods as unavailable. Paperclip
+      # errors if respond_to? isn't correct, so we override it here.
+      def respond_to?(method, include_all = false)
+        name = method.to_s.delete('=')
+        super(self.class.preference_getter_method(name), include_all) || super(method, include_all)
+      end

-    def has_attachment?(name)
-      self.class.respond_to?(:attachment_definitions) &&
-        self.class.attachment_definitions.key?(name.to_sym)
+      def has_attachment?(name)
+        self.class.respond_to?(:attachment_definitions) &&
+          self.class.attachment_definitions.key?(name.to_sym)
+      end
    end
  end
 end