diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index aa3e7a88db..2c867c2ec1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,17 +1,18 @@ # This configuration was generated by # `rubocop --auto-gen-config --exclude-limit 1400` -# on 2020-09-10 16:12:05 +1000 using RuboCop version 0.81.0. +# on 2020-10-14 09:49:36 +0100 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 # versions of RuboCop, may require this file to be generated again. -# Offense count: 2 +# Offense count: 3 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentationWidth. # SupportedStyles: with_first_argument, with_fixed_indentation Layout/ArgumentAlignment: Exclude: + - 'spec/models/spree/address_spec.rb' - 'spec/models/spree/order/checkout_spec.rb' # Offense count: 1 @@ -22,10 +23,11 @@ Layout/BlockAlignment: Exclude: - 'spec/models/spree/order/checkout_spec.rb' -# Offense count: 2 +# Offense count: 3 # Cop supports --auto-correct. Layout/EmptyLines: Exclude: + - 'spec/features/admin/variants_spec.rb' - 'spec/models/spree/payment_spec.rb' # Offense count: 4 @@ -118,7 +120,7 @@ Layout/SpaceInsideHashLiteralBraces: - 'spec/services/checkout/form_data_adapter_spec.rb' - 'spec/services/user_locale_setter_spec.rb' -# Offense count: 2 +# Offense count: 3 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: final_newline, final_blank_line @@ -126,6 +128,7 @@ Layout/TrailingEmptyLines: Exclude: - 'spec/factories.rb' - 'spec/factories/address_factory.rb' + - 'spec/support/request/stripe_helper.rb' # Offense count: 6 # Cop supports --auto-correct. @@ -171,11 +174,18 @@ 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' + - 'app/models/spree/taxon.rb' + # Offense count: 9 Naming/AccessorMethodName: Exclude: - 'app/controllers/spree/admin/taxonomies_controller.rb' - - 'app/models/spree/adjustment_decorator.rb' + - 'app/models/spree/adjustment.rb' - 'app/models/spree/order_decorator.rb' - 'lib/spree/core/controller_helpers/common.rb' - 'spec/support/request/shop_workflow.rb' @@ -208,14 +218,14 @@ Naming/PredicateName: - 'app/models/enterprise.rb' - 'app/models/enterprise_relationship.rb' - 'app/models/order_cycle.rb' - - 'app/models/spree/ability_decorator.rb' - - 'app/models/spree/adjustment_decorator.rb' + - 'app/models/spree/adjustment.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.rb' - 'app/models/spree/preferences/file_configuration.rb' - - 'app/models/spree/shipping_method_decorator.rb' + - 'app/models/spree/shipping_method.rb' + - 'app/models/spree/user.rb' - 'lib/open_food_network/customers_report.rb' - 'lib/open_food_network/order_cycle_management_report.rb' - 'lib/open_food_network/order_grouper.rb' @@ -238,6 +248,12 @@ Rails/ActiveRecordAliases: - 'spec/features/consumer/shopping/orders_spec.rb' - 'spec/requests/api/orders_spec.rb' +# Offense count: 1 +# Cop supports --auto-correct. +Rails/ApplicationController: + Exclude: + - 'engines/dfc_provider/app/controllers/dfc_provider/api/base_controller.rb' + # Offense count: 3 # Configuration parameters: EnforcedStyle. # SupportedStyles: strict, flexible @@ -271,15 +287,15 @@ Rails/FilePath: - 'spec/controllers/api/logos_controller_spec.rb' - 'spec/controllers/api/product_images_controller_spec.rb' - 'spec/controllers/api/promo_images_controller_spec.rb' + - 'spec/controllers/api/terms_and_conditions_controller_spec.rb' - 'spec/factories/product_factory.rb' - - 'spec/features/admin/content_spec.rb' - 'spec/features/admin/enterprises/images_spec.rb' - 'spec/models/content_configuration_spec.rb' - 'spec/models/spree/variant_spec.rb' - 'spec/serializers/api/admin/enterprise_serializer_spec.rb' - 'spec/support/downloads_helper.rb' -# Offense count: 9 +# Offense count: 7 # Cop supports --auto-correct. # Configuration parameters: Include. # Include: app/models/**/*.rb @@ -289,7 +305,6 @@ Rails/FindBy: - 'app/models/product_import/entry_processor.rb' - 'app/models/product_import/entry_validator.rb' - 'app/models/product_import/spreadsheet_data.rb' - - 'app/models/spree/shipment.rb' - 'app/models/spree/user.rb' # Offense count: 2 @@ -301,18 +316,21 @@ Rails/FindEach: - 'app/models/spree/order_decorator.rb' - 'app/models/spree/shipment.rb' -# Offense count: 6 +# Offense count: 9 # Configuration parameters: Include. # Include: app/models/**/*.rb Rails/HasAndBelongsToMany: Exclude: + - 'app/models/concerns/payment_method_distributors.rb' - 'app/models/enterprise.rb' - 'app/models/enterprise_group.rb' - - 'app/models/spree/concerns/payment_method_distributors.rb' - 'app/models/spree/line_item_decorator.rb' + - 'app/models/spree/role.rb' + - 'app/models/spree/shipping_method.rb' + - 'app/models/spree/user.rb' - 'app/models/spree/zone.rb' -# Offense count: 27 +# Offense count: 35 # Configuration parameters: Include. # Include: app/models/**/*.rb Rails/HasManyOrHasOneDependent: @@ -320,13 +338,16 @@ Rails/HasManyOrHasOneDependent: - 'app/models/customer.rb' - 'app/models/enterprise.rb' - 'app/models/order_cycle.rb' - - 'app/models/spree/adjustment_decorator.rb' + - 'app/models/spree/address.rb' + - 'app/models/spree/adjustment.rb' - 'app/models/spree/credit_card.rb' - 'app/models/spree/order_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' + - 'app/models/spree/shipping_category.rb' + - 'app/models/spree/shipping_method.rb' + - 'app/models/spree/taxonomy.rb' - 'app/models/spree/user.rb' - 'app/models/spree/variant_decorator.rb' - 'app/models/subscription.rb' @@ -347,7 +368,7 @@ Rails/HelperInstanceVariable: - 'app/helpers/spree/admin/orders_helper.rb' - 'app/helpers/spree/orders_helper.rb' -# Offense count: 35 +# Offense count: 33 # Configuration parameters: Include. # Include: app/controllers/**/*.rb Rails/LexicallyScopedActionFilter: @@ -363,7 +384,6 @@ Rails/LexicallyScopedActionFilter: - 'app/controllers/spree/admin/adjustments_controller.rb' - 'app/controllers/spree/admin/payment_methods_controller.rb' - 'app/controllers/spree/admin/payments_controller.rb' - - 'app/controllers/spree/admin/product_properties_controller.rb' - 'app/controllers/spree/admin/products_controller.rb' - 'app/controllers/spree/admin/search_controller.rb' - 'app/controllers/spree/admin/shipping_methods_controller.rb' @@ -403,7 +423,7 @@ Rails/ReflectionClassName: - 'app/models/enterprise_role.rb' - 'app/models/subscription.rb' -# Offense count: 241 +# Offense count: 243 # 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: @@ -419,12 +439,15 @@ Rails/SkipsModelValidations: - 'app/models/enterprise_relationship.rb' - 'app/models/product_import/inventory_reset_strategy.rb' - 'app/models/proxy_order.rb' - - 'app/models/spree/address_decorator.rb' + - 'app/models/spree/address.rb' + - 'app/models/spree/adjustment.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/shipping_method.rb' + - 'app/models/spree/tax_category.rb' + - 'app/models/spree/taxonomy.rb' - 'app/models/spree/zone.rb' - 'app/models/subscription.rb' - 'app/models/variant_override.rb' @@ -472,7 +495,6 @@ Rails/SkipsModelValidations: - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb' - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb' - 'spec/lib/stripe/credit_card_cloner_spec.rb' - - 'spec/models/calculator/weight_spec.rb' - 'spec/models/concerns/variant_stock_spec.rb' - 'spec/models/enterprise_relationship_spec.rb' - 'spec/models/exchange_spec.rb' @@ -480,6 +502,7 @@ Rails/SkipsModelValidations: - 'spec/models/spree/asset_spec.rb' - 'spec/models/spree/line_item_spec.rb' - 'spec/models/spree/order_spec.rb' + - 'spec/models/spree/tax_category_spec.rb' - 'spec/models/spree/variant_spec.rb' - 'spec/models/tag_rule/discount_order_spec.rb' - 'spec/serializers/api/admin/subscription_line_item_serializer_spec.rb' @@ -494,7 +517,7 @@ Rails/SkipsModelValidations: - 'spec/support/request/shop_workflow.rb' - 'spec/views/spree/shared/_order_details.html.haml_spec.rb' -# Offense count: 4 +# Offense count: 5 # Configuration parameters: Include. # Include: app/models/**/*.rb Rails/UniqueValidationWithoutIndex: @@ -502,6 +525,7 @@ Rails/UniqueValidationWithoutIndex: - 'app/models/customer.rb' - 'app/models/exchange.rb' - 'app/models/spree/stock_item.rb' + - 'app/models/spree/tax_category.rb' - 'app/models/spree/zone.rb' # Offense count: 2 @@ -512,14 +536,6 @@ 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: @@ -608,7 +624,7 @@ Style/FormatStringToken: - 'lib/open_food_network/sales_tax_report.rb' - 'spec/features/admin/bulk_order_management_spec.rb' -# Offense count: 829 +# Offense count: 818 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never @@ -739,7 +755,6 @@ Style/FrozenStringLiteralComment: - 'app/helpers/spree/admin/taxons_helper.rb' - 'app/helpers/spree/admin/zones_helper.rb' - 'app/helpers/spree/api/api_helpers.rb' - - 'app/helpers/spree/base_helper_decorator.rb' - 'app/helpers/spree/orders_helper.rb' - 'app/helpers/spree/reports_helper.rb' - 'app/helpers/spree_currency_helper.rb' @@ -803,13 +818,7 @@ Style/FrozenStringLiteralComment: - 'app/models/product_import/unit_converter.rb' - 'app/models/proxy_order.rb' - 'app/models/schedule.rb' - - 'app/models/spree/ability_decorator.rb' - - 'app/models/spree/address_decorator.rb' - - 'app/models/spree/adjustment_decorator.rb' - 'app/models/spree/app_configuration_decorator.rb' - - 'app/models/spree/calculator_decorator.rb' - - 'app/models/spree/classification_decorator.rb' - - 'app/models/spree/concerns/payment_method_distributors.rb' - 'app/models/spree/gateway/migs.rb' - 'app/models/spree/gateway/pin.rb' - 'app/models/spree/gateway/stripe_connect.rb' @@ -823,9 +832,6 @@ Style/FrozenStringLiteralComment: - 'app/models/spree/product_property_decorator.rb' - 'app/models/spree/product_set.rb' - 'app/models/spree/property.rb' - - 'app/models/spree/shipping_method_decorator.rb' - - 'app/models/spree/tax_rate_decorator.rb' - - 'app/models/spree/taxon_decorator.rb' - 'app/models/spree/user.rb' - 'app/models/spree/variant_decorator.rb' - 'app/models/stripe_account.rb' @@ -945,6 +951,7 @@ Style/FrozenStringLiteralComment: - 'app/services/tax_rate_finder.rb' - 'app/services/upload_sanitizer.rb' - 'app/services/variant_deleter.rb' + - 'app/services/variant_units/variant_and_line_item_naming.rb' - 'app/services/variants_stock_levels.rb' - 'app/validators/date_time_string_validator.rb' - 'app/validators/distributors_validator.rb' @@ -1043,10 +1050,8 @@ Style/FrozenStringLiteralComment: - 'lib/open_food_network/tag_rule_applicator.rb' - 'lib/open_food_network/user_balance_calculator.rb' - 'lib/open_food_network/users_and_enterprises_report.rb' - - 'lib/open_food_network/variant_and_line_item_naming.rb' - 'lib/open_food_network/xero_invoices_report.rb' - 'lib/spree/api/controller_setup.rb' - - 'lib/spree/api/testing_support/setup.rb' - 'lib/spree/authentication_helpers.rb' - 'lib/spree/localized_number.rb' - 'lib/spree/money_decorator.rb' @@ -1105,6 +1110,7 @@ Style/FrozenStringLiteralComment: - 'spec/controllers/api/statuses_controller_spec.rb' - 'spec/controllers/api/taxonomies_controller_spec.rb' - 'spec/controllers/api/taxons_controller_spec.rb' + - 'spec/controllers/api/terms_and_conditions_controller_spec.rb' - 'spec/controllers/api/variants_controller_spec.rb' - 'spec/controllers/base_controller_spec.rb' - 'spec/controllers/cart_controller_spec.rb' @@ -1147,6 +1153,7 @@ Style/FrozenStringLiteralComment: - 'spec/factories/order_cycle_factory.rb' - 'spec/factories/order_factory.rb' - 'spec/factories/product_factory.rb' + - 'spec/factories/return_authorization_factory.rb' - 'spec/factories/shipment_factory.rb' - 'spec/factories/shipping_method_factory.rb' - 'spec/factories/state_factory.rb' @@ -1159,6 +1166,7 @@ Style/FrozenStringLiteralComment: - 'spec/features/admin/authentication_spec.rb' - 'spec/features/admin/bulk_order_management_spec.rb' - 'spec/features/admin/bulk_product_update_spec.rb' + - 'spec/features/admin/configuration/content_spec.rb' - 'spec/features/admin/configuration/general_settings_spec.rb' - 'spec/features/admin/configuration/image_settings_spec.rb' - 'spec/features/admin/configuration/mail_methods_spec.rb' @@ -1167,14 +1175,12 @@ Style/FrozenStringLiteralComment: - 'spec/features/admin/configuration/tax_rates_spec.rb' - 'spec/features/admin/configuration/taxonomies_spec.rb' - 'spec/features/admin/configuration/zones_spec.rb' - - 'spec/features/admin/content_spec.rb' - 'spec/features/admin/customers_spec.rb' - 'spec/features/admin/enterprise_fees_spec.rb' - 'spec/features/admin/enterprise_groups_spec.rb' - 'spec/features/admin/enterprise_relationships_spec.rb' - 'spec/features/admin/enterprise_roles_spec.rb' - 'spec/features/admin/enterprise_user_spec.rb' - - 'spec/features/admin/enterprises/images_spec.rb' - 'spec/features/admin/enterprises/index_spec.rb' - 'spec/features/admin/enterprises_spec.rb' - 'spec/features/admin/external_services_spec.rb' @@ -1250,7 +1256,6 @@ Style/FrozenStringLiteralComment: - 'spec/lib/open_food_network/group_buy_report_spec.rb' - 'spec/lib/open_food_network/i18n_config_spec.rb' - 'spec/lib/open_food_network/lettuce_share_report_spec.rb' - - 'spec/lib/open_food_network/option_value_namer_spec.rb' - 'spec/lib/open_food_network/order_and_distributor_report_spec.rb' - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb' - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb' @@ -1331,7 +1336,6 @@ Style/FrozenStringLiteralComment: - 'spec/models/spree/shipping_method_spec.rb' - 'spec/models/spree/stock/availability_validator_spec.rb' - 'spec/models/spree/tax_rate_spec.rb' - - 'spec/models/spree/taxon_spec.rb' - 'spec/models/spree/user_spec.rb' - 'spec/models/spree/variant_spec.rb' - 'spec/models/stripe_account_spec.rb' @@ -1397,6 +1401,7 @@ Style/FrozenStringLiteralComment: - 'spec/services/search_orders_spec.rb' - 'spec/services/tax_rate_finder_spec.rb' - 'spec/services/upload_sanitizer_spec.rb' + - 'spec/services/variant_units/option_value_namer_spec.rb' - 'spec/services/variants_stock_levels_spec.rb' - 'spec/spec_helper.rb' - 'spec/support/ability_helper.rb' @@ -1425,7 +1430,7 @@ Style/FrozenStringLiteralComment: - 'spec/support/products_helper.rb' - 'spec/support/request/admin_helper.rb' - 'spec/support/request/authentication_helper.rb' - - 'spec/support/request/checkout_workflow.rb' + - 'spec/support/request/checkout_helper.rb' - 'spec/support/request/cookie_helper.rb' - 'spec/support/request/distribution_helper.rb' - 'spec/support/request/menu_helper.rb' @@ -1460,16 +1465,16 @@ Style/GuardClause: - 'app/models/enterprise.rb' - 'app/models/enterprise_group.rb' - 'app/models/producer_property.rb' - - 'app/models/spree/classification_decorator.rb' - 'app/models/spree/order_decorator.rb' - 'app/models/spree/price_decorator.rb' - 'app/models/spree/product_decorator.rb' - 'app/services/order_syncer.rb' + - 'app/services/variant_units/variant_and_line_item_naming.rb' - 'lib/discourse/single_sign_on.rb' - 'lib/open_food_network/order_cycle_form_applicator.rb' - 'lib/open_food_network/rack_request_blocker.rb' - - 'lib/open_food_network/variant_and_line_item_naming.rb' - 'spec/support/delayed_job_helper.rb' + - 'spec/support/request/checkout_helper.rb' - 'spec/support/request/distribution_helper.rb' - 'spec/support/request/shop_workflow.rb' @@ -1495,7 +1500,7 @@ Style/MixinUsage: - 'lib/open_food_network/orders_and_fulfillments_report.rb' - 'spec/lib/open_food_network/packing_report_spec.rb' -# Offense count: 37 +# Offense count: 36 # Cop supports --auto-correct. # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods. # SupportedStyles: predicate, comparison @@ -1508,7 +1513,6 @@ Style/NumericPredicate: - 'app/helpers/shared_helper.rb' - 'app/models/product_import/product_importer.rb' - 'app/models/product_import/spreadsheet_entry.rb' - - 'app/models/spree/adjustment_decorator.rb' - 'app/models/spree/gateway/stripe_connect.rb' - 'app/models/spree/line_item_decorator.rb' - 'app/models/spree/order_decorator.rb' @@ -1538,12 +1542,6 @@ 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. @@ -1563,7 +1561,6 @@ Style/RescueStandardError: # Offense count: 231 Style/Send: Exclude: - - 'app/models/spree/shipping_method_decorator.rb' - 'spec/controllers/admin/subscriptions_controller_spec.rb' - 'spec/controllers/checkout_controller_spec.rb' - 'spec/controllers/spree/admin/base_controller_spec.rb' @@ -1575,7 +1572,6 @@ Style/Send: - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb' - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb' - 'spec/lib/open_food_network/lettuce_share_report_spec.rb' - - 'spec/lib/open_food_network/option_value_namer_spec.rb' - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb' - 'spec/lib/open_food_network/permissions_spec.rb' - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb' @@ -1597,6 +1593,7 @@ Style/Send: - 'spec/models/tag_rule/filter_shipping_methods_spec.rb' - 'spec/services/cart_service_spec.rb' - 'spec/services/products_renderer_spec.rb' + - 'spec/services/variant_units/option_value_namer_spec.rb' - 'spec/spec_helper.rb' - 'spec/support/localized_number_helper.rb' - 'spec/support/matchers/delegate_matchers.rb'