From 7e606471e48fee77104abbb5c816c7f9c79889cc Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 19 May 2020 18:45:35 +0100 Subject: [PATCH] Make tag_rulee_applicator and available_payment_methods_filter handle case where a relation is given instead of an array --- lib/open_food_network/available_payment_method_filter.rb | 4 ++-- lib/open_food_network/tag_rule_applicator.rb | 2 +- spec/lib/open_food_network/tag_rule_applicator_spec.rb | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/open_food_network/available_payment_method_filter.rb b/lib/open_food_network/available_payment_method_filter.rb index 2e9af09bf8..30fd0e326d 100644 --- a/lib/open_food_network/available_payment_method_filter.rb +++ b/lib/open_food_network/available_payment_method_filter.rb @@ -2,9 +2,9 @@ module OpenFoodNetwork class AvailablePaymentMethodFilter def filter!(payment_methods) if stripe_enabled? - payment_methods.reject!{ |p| p.type.ends_with?("StripeConnect") && stripe_configuration_incomplete?(p) } + payment_methods.to_a.reject!{ |p| p.type.ends_with?("StripeConnect") && stripe_configuration_incomplete?(p) } else - payment_methods.reject!{ |p| p.type.ends_with?("StripeConnect") } + payment_methods.to_a.reject!{ |p| p.type.ends_with?("StripeConnect") } end end diff --git a/lib/open_food_network/tag_rule_applicator.rb b/lib/open_food_network/tag_rule_applicator.rb index fa5f1b6c49..0c01f5dd18 100644 --- a/lib/open_food_network/tag_rule_applicator.rb +++ b/lib/open_food_network/tag_rule_applicator.rb @@ -14,7 +14,7 @@ module OpenFoodNetwork def filter!(subject) return unless subject.respond_to?(:any?) && subject.any? - subject.reject! do |element| + subject.to_a.reject! do |element| if rule_class.respond_to?(:tagged_children_for) children = rule_class.tagged_children_for(element) children.reject! { |child| reject?(child) } diff --git a/spec/lib/open_food_network/tag_rule_applicator_spec.rb b/spec/lib/open_food_network/tag_rule_applicator_spec.rb index 3f9186dc16..50d8bfe32d 100644 --- a/spec/lib/open_food_network/tag_rule_applicator_spec.rb +++ b/spec/lib/open_food_network/tag_rule_applicator_spec.rb @@ -1,4 +1,5 @@ require 'open_food_network/tag_rule_applicator' +require 'spec_helper' module OpenFoodNetwork describe TagRuleApplicator do