Merge pull request #12204 from dacook/rubocop-autocorrect-more

Disable RSpec cops by default

.rubocop.yml

@@ -15,9 +15,10 @@ inherit_from:
   # The relaxed style rules as a common starting point which we can refine.
   - .rubocop_relaxed_styleguide.yml
 
-  # Our Open Food Network style guide. If you want to see all violations,
+  # Our Open Food Network style guides. If you want to see all violations,
   # then use only that configuration:
   #
   #     bundle exec rubocop -c .rubocop_styleguide.yml
   #
   - .rubocop_styleguide.yml
+  - .rubocop_rspec_styleguide.yml

.rubocop_rspec_styleguide.yml

@@ -0,0 +1,21 @@
+# OFN styleguide for rubocop-rspec
+# Because there are so many, we will disable by default, and enable rules as needed.
+
+Capybara:
+  Enabled: false
+
+RSpec:
+  Enabled: false
+
+FactoryBot:
+  Enabled: false
+
+RSpec/ExpectChange:
+  Enabled: true
+  EnforcedStyle: block
+
+RSpec/MultipleExpectations:
+  Max: 5 # Default 1
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10 # Default 5

.rubocop_styleguide.yml

@@ -125,16 +125,6 @@ Rails/SkipsModelValidations:
     - update_column
     - update_columns
 
-RSpec/ExpectChange:
-  Enabled: true
-  EnforcedStyle: block
-
-RSpec/MultipleExpectations:
-  Max: 5 # Default 1
-
-RSpec/MultipleMemoizedHelpers:
-  Max: 10 # Default 5
-
 Style/Documentation:
   Enabled: false
 

app/models/spree/payment.rb

@@ -21,7 +21,8 @@ module Spree
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
     has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0").completed },
-             class_name: "Spree::Payment", foreign_key: :source_id, dependent: :restrict_with_exception
+             class_name: "Spree::Payment", foreign_key: :source_id,
+             dependent: :restrict_with_exception
     has_many :log_entries, as: :source, dependent: :destroy
 
     has_one :adjustment, as: :adjustable, dependent: :destroy

spec/lib/spree/localized_number_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'spree/localized_number'
 
 describe Spree::LocalizedNumber do
   describe ".parse" do

spec/system/admin/tag_rules_spec.rb

@@ -216,39 +216,39 @@ describe 'Tag Rules' do
                        from: "enterprise_tag_rules_attributes_4_preferred_matched_" \
                              "shipping_methods_visibility"
       end
-      #       # Moving the Shipping Methods to top priority
-      #       find(".customer_tag#tg_4 .header", ).drag_to find(".customer_tag#tg_1 .header")
+      # # Moving the Shipping Methods to top priority
+      # find(".customer_tag#tg_4 .header", ).drag_to find(".customer_tag#tg_1 .header")
       #
-      #       click_button 'Update'
+      # click_button 'Update'
       #
-      #       # DEFAULT FilterShippingMethods rule
-      #       expect(default_fsm_tag_rule.reload.preferred_customer_tags).to eq ""
-      #       expect(default_fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only"
-      #       expect(default_fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "hidden"
+      # # DEFAULT FilterShippingMethods rule
+      # expect(default_fsm_tag_rule.reload.preferred_customer_tags).to eq ""
+      # expect(default_fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only"
+      # expect(default_fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "hidden"
       #
-      #       # FilterShippingMethods rule
-      #       expect(fsm_tag_rule.reload.priority).to eq 1
-      #       expect(fsm_tag_rule.preferred_customer_tags).to eq "volunteer"
-      #       expect(fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only4"
-      #       expect(fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "visible"
+      # # FilterShippingMethods rule
+      # expect(fsm_tag_rule.reload.priority).to eq 1
+      # expect(fsm_tag_rule.preferred_customer_tags).to eq "volunteer"
+      # expect(fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only4"
+      # expect(fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "visible"
       #
-      #       # FilterProducts rule
-      #       expect(fp_tag_rule.reload.priority).to eq 2
-      #       expect(fp_tag_rule.preferred_customer_tags).to eq "volunteer"
-      #       expect(fp_tag_rule.preferred_variant_tags).to eq "volunteers-only1"
-      #       expect(fp_tag_rule.preferred_matched_variants_visibility).to eq "hidden"
+      # # FilterProducts rule
+      # expect(fp_tag_rule.reload.priority).to eq 2
+      # expect(fp_tag_rule.preferred_customer_tags).to eq "volunteer"
+      # expect(fp_tag_rule.preferred_variant_tags).to eq "volunteers-only1"
+      # expect(fp_tag_rule.preferred_matched_variants_visibility).to eq "hidden"
       #
-      #       # FilterPaymentMethods rule
-      #       expect(fpm_tag_rule.reload.priority).to eq 3
-      #       expect(fpm_tag_rule.preferred_customer_tags).to eq "volunteer"
-      #       expect(fpm_tag_rule.preferred_payment_method_tags).to eq "volunteers-only2"
-      #       expect(fpm_tag_rule.preferred_matched_payment_methods_visibility).to eq "visible"
+      # # FilterPaymentMethods rule
+      # expect(fpm_tag_rule.reload.priority).to eq 3
+      # expect(fpm_tag_rule.preferred_customer_tags).to eq "volunteer"
+      # expect(fpm_tag_rule.preferred_payment_method_tags).to eq "volunteers-only2"
+      # expect(fpm_tag_rule.preferred_matched_payment_methods_visibility).to eq "visible"
       #
-      #       # FilterOrderCycles rule
-      #       expect(foc_tag_rule.reload.priority).to eq 4
-      #       expect(foc_tag_rule.preferred_customer_tags).to eq "volunteer"
-      #       expect(foc_tag_rule.preferred_exchange_tags).to eq "volunteers-only3"
-      #       expect(foc_tag_rule.preferred_matched_order_cycles_visibility).to eq "hidden"
+      # # FilterOrderCycles rule
+      # expect(foc_tag_rule.reload.priority).to eq 4
+      # expect(foc_tag_rule.preferred_customer_tags).to eq "volunteer"
+      # expect(foc_tag_rule.preferred_exchange_tags).to eq "volunteers-only3"
+      # expect(foc_tag_rule.preferred_matched_order_cycles_visibility).to eq "hidden"
     end
   end