mumukit 2.45.0 → 2.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4daef670d7b72e6a88cea099905e870f6534ba9d7da574323efc941e8e991e
-  data.tar.gz: 7293bd7160ff5249f5c06f45f34c4bfb87df2ee24128aefda1dbf421ad6be9cd
+  metadata.gz: 4373e0933cc618f5296133f601a28fc2a32497f072ebcef924bdb54757d54d5c
+  data.tar.gz: b31b3f50fa6e859b7815fc75d7da804b72146eceb35c3dff7c5b7558c5c61c23
 SHA512:
-  metadata.gz: 723eff33716d123138cc159cb3724e554e714bf8da1024afec1372033778488cb0f0c9ea9f3a555aa14a02610375ca4f674de79089d45ebfe8e3c8cbb234391f
-  data.tar.gz: b214cfcc02b1a24f81c4f34ed2d39865fe79d6a56a7fd73c79ef6902cb7218ad29b90deed1a408d58164f1d202fe088f35831a70ceb32bf6f235aaacb9a1821c
+  metadata.gz: e58de2ec660e81837568e02e13a1b2f7cb86f9fde5b607a761a130354df7bb7fa5acf364bb14a8819edc69c349f6a3c70a5e1ee98e627563d193935d7a7ff756
+  data.tar.gz: 8536f6834bc8c8d643084701c1cc509772b35780a9a3a89ea7c69ba57e23021a5961cf01fb9b13fd90bbcab0f105a6f6484b60ba18646916cbab63421f68da26

data/lib/locales/en.yml

@@ -15,5 +15,5 @@ en:
       check_query_outputs: "query '%{query}' output should be '%{expected}' but was '%{actual}'"
       check_query_passes: "query '%{query}' should pass but it failed"
       goal_passed: "goal was met successfully"
-      check_queries_match: "All the required queries must be executed"
-      check_queries_equal: "All the required queries must be executed"
+      check_queries_match: "All the required queries must be executed. Executed %{all} but only %{matches} match the expectations"
+      check_queries_equal: "All the required queries must be executed. Executed %{all} but only %{matches} match the expectations"

data/lib/locales/es-CL.yml

@@ -15,5 +15,5 @@ es-CL:
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
       goal_passed: "El objetivo se cumplió exitosamente"
-      check_queries_match: "Se deben realizar todas las consultas solicitadas"
-      check_queries_equal: "Se deben realizar todas las consultas solicitadas"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"
+      check_queries_equal: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"

data/lib/locales/es.yml

@@ -15,5 +15,5 @@ es:
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
       goal_passed: "El objetivo se cumplió exitosamente"
-      check_queries_match: "Se deben realizar todas las consultas solicitadas"
-      check_queries_equal: "Se deben realizar todas las consultas solicitadas"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"
+      check_queries_equal: "Se deben realizar todas las consultas solicitadas. Se ejecutaron %{all} pero sólo %{matches} coinciden con las solicitadas"

data/lib/locales/pt.yml

@@ -14,6 +14,6 @@ pt:
       check_query_fails: "a consulta '%{query}' deve falhar, mas passou"
       check_query_outputs: "a consulta '%{query}' deve ser '%{expected}', mas foi '%{actual}'"
       check_query_passes: "a consulta '%{query}' deve passar, mas falhou"
-      check_queries_match: "Todas as consultas solicitadas devem ser feitas"
-      check_queries_equal: "Todas as consultas solicitadas devem ser feitas"
+      check_queries_match: "Todas as consultas solicitadas devem ser feitas. %{all} foram feitas mas só %{matches} correspondem com as solicitadas"
+      check_queries_equal: "Todas as consultas solicitadas devem ser feitas. %{all} foram feitas mas só %{matches} correspondem com as solicitadas"
       goal_passed: "O objetivo foi alcançado com sucesso"

data/lib/mumukit/metatest/interactive_checker.rb

@@ -24,15 +24,17 @@ module Mumukit::Metatest
     end
 
     def check_queries_equal(result, goal)
-      fail_t :check_queries_equal unless goal[:values].all? do |regexp|
-        queries.any? { |query| query == regexp }
-      end
+      matches = goal[:values].map do |value|
+        queries.find { |query| query == value }
+      end.compact
+      fail_queries_t :check_queries_equal, queries, matches, goal[:values]
     end
 
     def check_queries_match(result, goal)
-      fail_t :check_queries_match unless goal[:regexps].all? do |regexp|
-        queries.any? { |query| query.match? regexp }
-      end
+      matches = goal[:regexps].map do |regexp|
+        queries.find { |query| query.match? regexp }
+      end.compact
+      fail_queries_t :check_queries_match, queries, matches, goal[:regexps]
     end
 
     def check_last_query_outputs(result, goal)
@@ -90,6 +92,14 @@ module Mumukit::Metatest
 
     private
 
+    def join_queries(queries)
+      queries.map { |it| "`#{it}`" }.join(", ").presence || '**∅**'
+    end
+
+    def fail_queries_t(key, queries, matches, expectations)
+      fail_t key, all: join_queries(queries), matches: join_queries(matches) unless matches.size == expectations.size
+    end
+
     def query
       strip @request.query.to_s
     end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.45.0'
+  VERSION = '2.46.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.45.0
+  version: 2.46.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler