From ea584504bdafe70ebc77ef9db4d65c5a6f014f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:32:02 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump rubocop-rails from 2.24.0 to 2.24.1 Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.24.0 to 2.24.1. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.0...v2.24.1) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 213c47b751..06f209df8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -505,7 +505,7 @@ GEM railties (>= 4.2) raabro (1.4.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-mini-profiler (2.3.4) rack (>= 1.2.0) rack-oauth2 (2.2.1) @@ -663,7 +663,7 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) From f8a7635463cb48a7f1158216c0b42a5bacd5b9a0 Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 26 Mar 2024 09:38:24 +1100 Subject: [PATCH 2/2] Regenerate Rubocop's TODO file Using params in script/rubocop-autocorrect.sh: bundle exec rubocop --regenerate-todo --no-auto-gen-timestamp And yay, no new violations! --- .rubocop_todo.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 44ed59b1a2..80de3c4a6e 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -44,7 +44,7 @@ Lint/DuplicateRequire: Exclude: - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb' -# Offense count: 18 +# Offense count: 16 # Configuration parameters: AllowComments, AllowEmptyLambdas. Lint/EmptyBlock: Exclude: @@ -201,8 +201,8 @@ Metrics/ClassLength: - 'app/serializers/api/cached_enterprise_serializer.rb' - 'app/serializers/api/enterprise_shopfront_serializer.rb' - 'app/services/cart_service.rb' - - 'app/services/orders/sync_service.rb' - 'app/services/order_cycles/form_service.rb' + - 'app/services/orders/sync_service.rb' - 'engines/order_management/app/services/order_management/order/updater.rb' - 'lib/open_food_network/enterprise_fee_calculator.rb' - 'lib/open_food_network/order_cycle_form_applicator.rb' @@ -470,14 +470,13 @@ Rails/LexicallyScopedActionFilter: - 'app/controllers/spree/admin/zones_controller.rb' - 'app/controllers/spree/users_controller.rb' -# Offense count: 6 +# Offense count: 5 # This cop supports unsafe autocorrection (--autocorrect-all). Rails/NegateInclude: Exclude: - 'app/controllers/admin/resource_controller.rb' - 'app/models/calculator/weight.rb' - 'app/models/product_import/spreadsheet_entry.rb' - - 'app/services/order_cart_reset.rb' - 'lib/spree/localized_number.rb' - 'spec/support/matchers/table_matchers.rb' @@ -596,8 +595,8 @@ Rails/TimeZone: Exclude: - 'app/models/spree/gateway/pay_pal_express.rb' - 'spec/controllers/spree/credit_cards_controller_spec.rb' - - 'spec/services/orders/customer_cancellation_service_spec.rb' - 'spec/services/order_cycles/webhook_service_spec.rb' + - 'spec/services/orders/customer_cancellation_service_spec.rb' # Offense count: 1 # Configuration parameters: TransactionMethods. @@ -686,7 +685,7 @@ Security/Open: Exclude: - 'app/services/image_importer.rb' -# Offense count: 9 +# Offense count: 7 # This cop supports unsafe autocorrection (--autocorrect-all). Style/ArrayIntersect: Exclude: @@ -695,7 +694,6 @@ Style/ArrayIntersect: - 'app/models/tag_rule/filter_payment_methods.rb' - 'app/models/tag_rule/filter_products.rb' - 'app/models/tag_rule/filter_shipping_methods.rb' - - 'app/services/order_syncer.rb' - 'lib/open_food_network/tag_rule_applicator.rb' - 'spec/support/matchers/select2_matchers.rb'