Skip to content

Commit e6a57c3

Browse files
authored
Merge pull request #6281 from mamhoff/regenerate-todo-june-25
Regenerate Rubocop TODO file, adapt config
2 parents 13e4fae + c703a3e commit e6a57c3

File tree

2 files changed

+11
-47
lines changed

2 files changed

+11
-47
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Style/ClassVars:
1919
Enabled: false
2020

2121
# We need these names for backwards compatability
22-
Naming/PredicateName:
22+
Naming/PredicatePrefix:
2323
Enabled: false
2424

2525
# We want to name rescued errors as error not simply e.

.rubocop_todo.yml

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2025-05-29 09:46:52 UTC using RuboCop version 1.75.7.
3+
# on 2025-06-06 06:59:49 UTC using RuboCop version 1.76.0.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -14,7 +14,7 @@ Gemspec/OrderedDependencies:
1414
Exclude:
1515
- 'core/solidus_core.gemspec'
1616

17-
# Offense count: 165
17+
# Offense count: 175
1818
# This cop supports safe autocorrection (--autocorrect).
1919
# Configuration parameters: EnforcedStyle, IndentationWidth.
2020
# SupportedStyles: with_first_argument, with_fixed_indentation
@@ -207,6 +207,11 @@ Lint/AmbiguousOperator:
207207
Lint/ConstantDefinitionInBlock:
208208
Enabled: false
209209

210+
# Offense count: 1
211+
Lint/DuplicateMethods:
212+
Exclude:
213+
- 'admin/app/controllers/solidus_admin/resources_controller.rb'
214+
210215
# Offense count: 1
211216
# This cop supports safe autocorrection (--autocorrect).
212217
# Configuration parameters: AutoCorrect, AllowComments.
@@ -220,11 +225,6 @@ Lint/RedundantCopDisableDirective:
220225
Exclude:
221226
- 'Gemfile'
222227

223-
# Offense count: 1
224-
Lint/ShadowingOuterLocalVariable:
225-
Exclude:
226-
- 'core/lib/generators/solidus/install/install_generator.rb'
227-
228228
# Offense count: 2
229229
# This cop supports safe autocorrection (--autocorrect).
230230
# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -337,7 +337,7 @@ Rails/FilePath:
337337
- 'core/lib/spree/testing_support/dummy_app.rb'
338338
- 'sample/lib/spree/sample.rb'
339339

340-
# Offense count: 65
340+
# Offense count: 61
341341
# Configuration parameters: Include.
342342
# Include: **/app/models/**/*.rb
343343
Rails/HasManyOrHasOneDependent:
@@ -379,7 +379,7 @@ Rails/IndexWith:
379379
- 'core/lib/spree/core/search/variant.rb'
380380
- 'core/lib/spree/preferences/preferable.rb'
381381

382-
# Offense count: 39
382+
# Offense count: 35
383383
# Configuration parameters: IgnoreScopes, Include.
384384
# Include: **/app/models/**/*.rb
385385
Rails/InverseOf:
@@ -405,19 +405,6 @@ Rails/LexicallyScopedActionFilter:
405405
- 'backend/app/controllers/spree/admin/variants_controller.rb'
406406
- 'backend/app/controllers/spree/admin/zones_controller.rb'
407407

408-
# Offense count: 11
409-
# This cop supports unsafe autocorrection (--autocorrect-all).
410-
# Configuration parameters: Include.
411-
# Include: **/app/**/*.rb, **/config/**/*.rb, db/**/*.rb, **/lib/**/*.rb
412-
Rails/Output:
413-
Exclude:
414-
- 'core/lib/generators/spree/dummy/dummy_generator.rb'
415-
- 'core/lib/spree/testing_support/common_rake.rb'
416-
- 'core/lib/spree/testing_support/dummy_app/migrations.rb'
417-
- 'core/lib/spree/testing_support/translations.rb'
418-
- 'promotions/lib/generators/solidus_promotions/install/install_generator.rb'
419-
- 'promotions/lib/solidus_promotions/promotion_migrator.rb'
420-
421408
# Offense count: 9
422409
Rails/OutputSafety:
423410
Exclude:
@@ -503,28 +490,6 @@ Rails/TimeZone:
503490
- 'core/spec/models/spree/order/outstanding_balance_integration_spec.rb'
504491
- 'core/spec/models/spree/tax/taxation_integration_spec.rb'
505492

506-
# Offense count: 20
507-
# This cop supports safe autocorrection (--autocorrect).
508-
# Configuration parameters: Include.
509-
# Include: **/app/models/**/*.rb
510-
Rails/Validation:
511-
Exclude:
512-
- 'core/app/models/spree/classification.rb'
513-
- 'core/app/models/spree/inventory_unit.rb'
514-
- 'core/app/models/spree/role_user.rb'
515-
- 'core/app/models/spree/stock_location.rb'
516-
- 'core/app/models/spree/store_credit.rb'
517-
- 'core/app/models/spree/store_credit_event.rb'
518-
- 'core/app/models/spree/tax_category.rb'
519-
- 'core/app/models/spree/user_address.rb'
520-
- 'core/app/models/spree/variant.rb'
521-
- 'core/app/models/spree/variant_property_rule_condition.rb'
522-
- 'core/app/models/spree/wallet_payment_source.rb'
523-
- 'legacy_promotions/app/models/spree/promotion/rules/product.rb'
524-
- 'legacy_promotions/app/models/spree/promotion/rules/taxon.rb'
525-
- 'legacy_promotions/app/models/spree/promotion_category.rb'
526-
- 'legacy_promotions/app/models/spree/promotion_code_batch.rb'
527-
528493
# Offense count: 21
529494
# This cop supports safe autocorrection (--autocorrect).
530495
# Configuration parameters: EnforcedStyle.
@@ -680,11 +645,10 @@ Style/RedundantInterpolation:
680645
Exclude:
681646
- 'core/lib/spree/testing_support/common_rake.rb'
682647

683-
# Offense count: 3
648+
# Offense count: 2
684649
# This cop supports safe autocorrection (--autocorrect).
685650
Style/RedundantParentheses:
686651
Exclude:
687-
- 'api/app/views/spree/api/line_items/new.json.jbuilder'
688652
- 'bin/console'
689653
- 'core/lib/generators/spree/dummy/dummy_generator.rb'
690654

0 commit comments

Comments
 (0)