From 5495f6574aca0049e6bd4a2c406a697a2753f401 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 25 Feb 2021 13:01:49 -0600 Subject: [PATCH] Rubocop spec/support/expect.rb --- spec/support/expect.rb | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/spec/support/expect.rb b/spec/support/expect.rb index b9f6feb3..8ea28e39 100644 --- a/spec/support/expect.rb +++ b/spec/support/expect.rb @@ -3,23 +3,28 @@ # License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later # Full license explanation at https://github.com/houdiniproject/houdini/blob/master/LICENSE module Expect - def expect_validation_errors(list_of_errors, validators, error_validator_length_should_match = true) - if list_of_errors.is_a?(ParamValidation::ValidationError) + def expect_validation_errors(list_of_errors, validators, error_validator_length_should_match: true) # rubocop:disable Metrics/AbcSize + list_of_errors = get_list_of_errors(list_of_errors) + validators = [validators] if validators.is_a?(Hash) + expect(list_of_errors.length).to eq(validators.length) if error_validator_length_should_match - list_of_errors = list_of_errors.data - end - list_of_errors = [list_of_errors] if list_of_errors.is_a?(Hash) - validators = [validators] if validators.is_a?(Hash) - if error_validator_length_should_match - expect(list_of_errors.length).to eq(validators.length) - end + validators.each do |i| + expect(list_of_errors.any? do |e| + e[:key].to_s == i[:key].to_s && e[:name].to_s == i[:name].to_s + end).to eq(true), "#{i[:key]} should have existed for #{i[:name]}" + end + end - validators.each do |i| - expect(list_of_errors.any? { |e| e[:key].to_s == i[:key].to_s && e[:name].to_s == i[:name].to_s }).to eq(true), "#{i[:key]} should have existed for #{i[:name]}" - end - end + def match_houid(prefix) + match(/#{prefix}_[a-zA-Z0-9]{22}/) + end - def match_houid(prefix) - match(/#{prefix}_[a-zA-Z0-9]{22}/) - end + private + + def get_list_of_errors(list_of_errors) + return list_of_errors.data if list_of_errors.is_a?(ParamValidation::ValidationError) + return [list_of_errors] if list_of_errors.is_a?(Hash) + + list_of_errors + end end