diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3db3e088d2..608594cd53 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -759,12 +759,6 @@ Style/ArrayIntersect: - 'lib/open_food_network/tag_rule_applicator.rb' - 'spec/support/matchers/select2_matchers.rb' -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -Style/BlockComments: - Exclude: - - 'spec/system/admin/tag_rules_spec.rb' - # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowOnConstant, AllowOnSelfClass. @@ -903,7 +897,7 @@ Style/HashLikeCase: Exclude: - 'app/models/enterprise.rb' -# Offense count: 1782 +# Offense count: 1784 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols. # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys diff --git a/spec/system/admin/tag_rules_spec.rb b/spec/system/admin/tag_rules_spec.rb index 01ad0741ee..9d698c6af4 100644 --- a/spec/system/admin/tag_rules_spec.rb +++ b/spec/system/admin/tag_rules_spec.rb @@ -206,41 +206,39 @@ describe 'Tag Rules' do from: "enterprise_tag_rules_attributes_4_preferred_matched_" \ "shipping_methods_visibility" end -=begin - # Moving the Shipping Methods to top priority - find(".customer_tag#tg_4 .header", ).drag_to find(".customer_tag#tg_1 .header") - - 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" - - # 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" - - # 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" -=end + # # Moving the Shipping Methods to top priority + # find(".customer_tag#tg_4 .header", ).drag_to find(".customer_tag#tg_1 .header") + # + # 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" + # + # # 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" + # + # # 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" end end