From e6b4f462ef8fd5027a5103e035f9084cb51f73b1 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 25 Feb 2022 10:02:31 +1100 Subject: [PATCH] Revert "Add rubocop config to allow specs to be 300 lines long" This reverts commit 0b51d8b2975cc60fc7ae6051262bf85bbbce07db. I think that this config was complicated in the setup and potentially confusing to have different rules in different places. It's better to fix those spec files by either making them smaller or removing the `module` block in the spec. We can reference the modules explicitely where needed. --- .rubocop_specs.yml | 7 ----- .rubocop_todo.yml | 35 ++++++++++++++++++++-- engines/catalog/spec/.rubocop.yml | 2 -- engines/dfc_provider/spec/.rubocop.yml | 2 -- engines/order_management/spec/.rubocop.yml | 2 -- engines/web/spec/.rubocop.yml | 2 -- spec/.rubocop.yml | 2 -- 7 files changed, 33 insertions(+), 19 deletions(-) delete mode 100644 .rubocop_specs.yml delete mode 100644 engines/catalog/spec/.rubocop.yml delete mode 100644 engines/dfc_provider/spec/.rubocop.yml delete mode 100644 engines/order_management/spec/.rubocop.yml delete mode 100644 engines/web/spec/.rubocop.yml delete mode 100644 spec/.rubocop.yml diff --git a/.rubocop_specs.yml b/.rubocop_specs.yml deleted file mode 100644 index 8ea54cd55c..0000000000 --- a/.rubocop_specs.yml +++ /dev/null @@ -1,7 +0,0 @@ -inherit_from: - - .rubocop.yml - -# This rubocop config file is only used for specs -# Here we allow specs to be 300 lines long -Metrics/ModuleLength: - Max: 300 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index cf3c7a46ae..14cbe53446 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400` -# on 2022-02-25 00:56:00 UTC using RuboCop version 1.22.2. +# on 2022-02-25 01:04:47 UTC using RuboCop version 1.22.2. # 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 @@ -596,7 +596,7 @@ Metrics/MethodLength: - 'lib/open_food_network/xero_invoices_report.rb' - 'lib/tasks/sample_data/product_factory.rb' -# Offense count: 20 +# Offense count: 51 # Configuration parameters: CountComments, Max, CountAsOne. Metrics/ModuleLength: Exclude: @@ -608,18 +608,49 @@ Metrics/ModuleLength: - 'app/helpers/spree/admin/orders_helper.rb' - 'app/models/spree/order/checkout.rb' - 'app/models/spree/payment/processing.rb' + - 'engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb' + - 'engines/order_management/spec/services/order_management/order/updater_spec.rb' + - 'engines/order_management/spec/services/order_management/stock/package_spec.rb' + - 'engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb' + - 'engines/order_management/spec/services/order_management/subscriptions/form_spec.rb' - 'engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb' + - 'engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb' + - 'engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb' - 'engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb' + - 'engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb' - 'lib/open_food_network/column_preference_defaults.rb' + - 'spec/controllers/admin/customers_controller_spec.rb' - 'spec/controllers/admin/order_cycles_controller_spec.rb' + - 'spec/controllers/api/v0/order_cycles_controller_spec.rb' - 'spec/controllers/api/v0/orders_controller_spec.rb' + - 'spec/controllers/payment_gateways/stripe_controller_spec.rb' + - 'spec/controllers/spree/admin/adjustments_controller_spec.rb' + - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb' + - 'spec/lib/open_food_network/address_finder_spec.rb' + - 'spec/lib/open_food_network/customers_report_spec.rb' + - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb' - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb' + - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb' - 'spec/lib/open_food_network/order_cycle_permissions_spec.rb' + - 'spec/lib/open_food_network/order_grouper_spec.rb' + - 'spec/lib/open_food_network/permissions_spec.rb' + - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb' + - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb' + - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb' + - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb' - 'spec/models/spree/adjustment_spec.rb' + - 'spec/models/spree/credit_card_spec.rb' - 'spec/models/spree/line_item_spec.rb' + - 'spec/models/spree/order/tax_spec.rb' - 'spec/models/spree/product_spec.rb' + - 'spec/models/spree/shipping_method_spec.rb' - 'spec/models/spree/tax_rate_spec.rb' - 'spec/models/spree/variant_spec.rb' + - 'spec/services/permissions/order_spec.rb' + - 'spec/services/variant_units/option_value_namer_spec.rb' + - 'spec/support/request/shop_workflow.rb' + - 'spec/support/request/stripe_stubs.rb' + - 'spec/support/request/web_helper.rb' # Offense count: 7 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters. diff --git a/engines/catalog/spec/.rubocop.yml b/engines/catalog/spec/.rubocop.yml deleted file mode 100644 index 26e3e2c99a..0000000000 --- a/engines/catalog/spec/.rubocop.yml +++ /dev/null @@ -1,2 +0,0 @@ -inherit_from: - - ../../../.rubocop_specs.yml diff --git a/engines/dfc_provider/spec/.rubocop.yml b/engines/dfc_provider/spec/.rubocop.yml deleted file mode 100644 index 26e3e2c99a..0000000000 --- a/engines/dfc_provider/spec/.rubocop.yml +++ /dev/null @@ -1,2 +0,0 @@ -inherit_from: - - ../../../.rubocop_specs.yml diff --git a/engines/order_management/spec/.rubocop.yml b/engines/order_management/spec/.rubocop.yml deleted file mode 100644 index 26e3e2c99a..0000000000 --- a/engines/order_management/spec/.rubocop.yml +++ /dev/null @@ -1,2 +0,0 @@ -inherit_from: - - ../../../.rubocop_specs.yml diff --git a/engines/web/spec/.rubocop.yml b/engines/web/spec/.rubocop.yml deleted file mode 100644 index 26e3e2c99a..0000000000 --- a/engines/web/spec/.rubocop.yml +++ /dev/null @@ -1,2 +0,0 @@ -inherit_from: - - ../../../.rubocop_specs.yml diff --git a/spec/.rubocop.yml b/spec/.rubocop.yml deleted file mode 100644 index 5d20d5e3d1..0000000000 --- a/spec/.rubocop.yml +++ /dev/null @@ -1,2 +0,0 @@ -inherit_from: - - ../.rubocop_specs.yml