lib/fitting/report/combinations.rb in fitting-2.17.0 vs lib/fitting/report/combinations.rb in fitting-2.18.0

- old
+ new

@@ -12,35 +12,34 @@ def size @combinations.size end def size_with_tests - @combinations.count { |c| c.tests.size != 0 } + @combinations.count { |c| !c.tests.empty? } end def join(tests) tests.to_a.map do |test| - if is_there_a_suitable_combination?(test) + if there_a_suitable_combination?(test) cram_into_the_appropriate_combinations(test) test.mark_combination end end end - def is_there_a_suitable_combination?(test) + def there_a_suitable_combination?(test) return false if @combinations.nil? + @combinations.map do |combination| return true if JSON::Validator.fully_validate(combination.json_schema, test.body) == [] end false end def cram_into_the_appropriate_combinations(test) @combinations.map do |combination| - if JSON::Validator.fully_validate(combination.json_schema, test.body) == [] - combination.add_test(test) - end + combination.add_test(test) if JSON::Validator.fully_validate(combination.json_schema, test.body) == [] end end end end end