diff --git a/.rubocop.yml b/.rubocop.yml index a69446c98b4..f18e53d3ea6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -19,7 +19,7 @@ Style/ClassVars: Enabled: false # We need these names for backwards compatability -Naming/PredicateName: +Naming/PredicatePrefix: Enabled: false # We want to name rescued errors as error not simply e. diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 01522b63193..25facc81389 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2025-05-29 09:46:52 UTC using RuboCop version 1.75.7. +# on 2025-06-06 06:59:49 UTC using RuboCop version 1.76.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 @@ -14,7 +14,7 @@ Gemspec/OrderedDependencies: Exclude: - 'core/solidus_core.gemspec' -# Offense count: 165 +# Offense count: 175 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle, IndentationWidth. # SupportedStyles: with_first_argument, with_fixed_indentation @@ -207,6 +207,11 @@ Lint/AmbiguousOperator: Lint/ConstantDefinitionInBlock: Enabled: false +# Offense count: 1 +Lint/DuplicateMethods: + Exclude: + - 'admin/app/controllers/solidus_admin/resources_controller.rb' + # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AutoCorrect, AllowComments. @@ -220,11 +225,6 @@ Lint/RedundantCopDisableDirective: Exclude: - 'Gemfile' -# Offense count: 1 -Lint/ShadowingOuterLocalVariable: - Exclude: - - 'core/lib/generators/solidus/install/install_generator.rb' - # Offense count: 2 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments. @@ -337,7 +337,7 @@ Rails/FilePath: - 'core/lib/spree/testing_support/dummy_app.rb' - 'sample/lib/spree/sample.rb' -# Offense count: 65 +# Offense count: 61 # Configuration parameters: Include. # Include: **/app/models/**/*.rb Rails/HasManyOrHasOneDependent: @@ -379,7 +379,7 @@ Rails/IndexWith: - 'core/lib/spree/core/search/variant.rb' - 'core/lib/spree/preferences/preferable.rb' -# Offense count: 39 +# Offense count: 35 # Configuration parameters: IgnoreScopes, Include. # Include: **/app/models/**/*.rb Rails/InverseOf: @@ -405,19 +405,6 @@ Rails/LexicallyScopedActionFilter: - 'backend/app/controllers/spree/admin/variants_controller.rb' - 'backend/app/controllers/spree/admin/zones_controller.rb' -# Offense count: 11 -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: Include. -# Include: **/app/**/*.rb, **/config/**/*.rb, db/**/*.rb, **/lib/**/*.rb -Rails/Output: - Exclude: - - 'core/lib/generators/spree/dummy/dummy_generator.rb' - - 'core/lib/spree/testing_support/common_rake.rb' - - 'core/lib/spree/testing_support/dummy_app/migrations.rb' - - 'core/lib/spree/testing_support/translations.rb' - - 'promotions/lib/generators/solidus_promotions/install/install_generator.rb' - - 'promotions/lib/solidus_promotions/promotion_migrator.rb' - # Offense count: 9 Rails/OutputSafety: Exclude: @@ -503,28 +490,6 @@ Rails/TimeZone: - 'core/spec/models/spree/order/outstanding_balance_integration_spec.rb' - 'core/spec/models/spree/tax/taxation_integration_spec.rb' -# Offense count: 20 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/app/models/**/*.rb -Rails/Validation: - Exclude: - - 'core/app/models/spree/classification.rb' - - 'core/app/models/spree/inventory_unit.rb' - - 'core/app/models/spree/role_user.rb' - - 'core/app/models/spree/stock_location.rb' - - 'core/app/models/spree/store_credit.rb' - - 'core/app/models/spree/store_credit_event.rb' - - 'core/app/models/spree/tax_category.rb' - - 'core/app/models/spree/user_address.rb' - - 'core/app/models/spree/variant.rb' - - 'core/app/models/spree/variant_property_rule_condition.rb' - - 'core/app/models/spree/wallet_payment_source.rb' - - 'legacy_promotions/app/models/spree/promotion/rules/product.rb' - - 'legacy_promotions/app/models/spree/promotion/rules/taxon.rb' - - 'legacy_promotions/app/models/spree/promotion_category.rb' - - 'legacy_promotions/app/models/spree/promotion_code_batch.rb' - # Offense count: 21 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. @@ -680,11 +645,10 @@ Style/RedundantInterpolation: Exclude: - 'core/lib/spree/testing_support/common_rake.rb' -# Offense count: 3 +# Offense count: 2 # This cop supports safe autocorrection (--autocorrect). Style/RedundantParentheses: Exclude: - - 'api/app/views/spree/api/line_items/new.json.jbuilder' - 'bin/console' - 'core/lib/generators/spree/dummy/dummy_generator.rb'