mumukit 2.40.0 → 2.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df39585e9af97eafeaa33f6189749ed29458e5a55ab37cf3339ae4200fc3f97
-  data.tar.gz: 0d272a7e75b9cd754314cdaafac2e3158b3b80374e88099be3633066d0098ef0
+  metadata.gz: 50c02218ee8201dec0cafb926af1244f37005ca30defbf277647e8f578b80b5f
+  data.tar.gz: ca71b312b3b89e4af2601a30248d25e218c2cfa2e51144f839996e12d097bdf8
 SHA512:
-  metadata.gz: 7d7868073a960f5c0476bb8dd09aa84bb3d3aa1427ea1fef0700c4d664778cb40c60a18f6db212fc641e784839913e17ba23863788c393535b186764e2f44cdb
-  data.tar.gz: ca71c3f73c932143b403e4758e110f1e2f209f15cca3ada46365f95bc4974bef8042939e558ac5e11ef6e280b239dbd5abc48aa836fd8206b6098904b3473141
+  metadata.gz: 1d7a38c84758cfc37544a392215164550c8adf7885d7fc4bc836e96dada9436a4f1a542b7c7ccc82dde5590d787e8f906b9d7fef711b3db1b2e27e9b21628b8d
+  data.tar.gz: aa52beb81dff6b2986ac84aaa400c15cd3bec40f6947b8286b9b62ec2eb315bce5a7ff04b99c89927339cd54021e34ec37c583a5927eb98515337dacb9d4cca8

data/lib/locales/en.yml

@@ -6,7 +6,7 @@ en:
     interactive:
       check_last_query_equals: "query should be '%{expected}' but was '%{actual}'"
       check_last_query_fails: "query should fail but it passed"
-      check_last_query_matches: "query does not match regex %{regex}"
+      check_last_query_matches: "query does not match regexp %{regexp}"
       check_last_query_outputs: "query output should be '%{expected}' but was '%{actual}'"
       check_last_query_includes: "query output should include '%{expected}' but was '%{actual}'"
       check_last_query_like: "query output should be like '%{expected}' but was '%{actual}'"
@@ -15,3 +15,4 @@ 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"

data/lib/locales/es-CL.yml

@@ -6,7 +6,7 @@ es-CL:
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
       check_last_query_fails: "La consulta debería fallar pero pasó"
-      check_last_query_matches: "La consulta no cumple con la expresión regular %{regex}"
+      check_last_query_matches: "La consulta no cumple con la expresión regular %{regexp}"
       check_last_query_outputs: "La consulta debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_last_query_includes: "La consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
       check_last_query_like: "La consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
@@ -15,3 +15,4 @@ 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"

data/lib/locales/es.yml

@@ -6,7 +6,7 @@ es:
     interactive:
       check_last_query_equals: "La consulta debería ser '%{expected}' pero fue '%{actual}'"
       check_last_query_fails: "La consulta debería fallar pero pasó"
-      check_last_query_matches: "La consulta no cumple con la expresión regular %{regex}"
+      check_last_query_matches: "La consulta no cumple con la expresión regular %{regexp}"
       check_last_query_outputs: "La consulta debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_last_query_includes: "La consulta debería incluir '%{expected}' pero devolvió '%{actual}'"
       check_last_query_like: "La consulta debería ser como '%{expected}' pero devolvió '%{actual}'"
@@ -14,4 +14,5 @@ es:
       check_query_fails: "La consulta '%{query}' debería fallar pero pasó"
       check_query_outputs: "La consulta '%{query}' debería devolver '%{expected}' pero devolvió '%{actual}'"
       check_query_passes: "La consulta '%{query}' debería pasar pero falló"
+      check_queries_match: "Se deben realizar todas las consultas solicitadas"
       goal_passed: "El objetivo se cumplió exitosamente"

data/lib/locales/pt.yml

@@ -6,7 +6,7 @@ pt:
     interactive:
       check_last_query_equals: "a consulta deve ser '%{expected}' mas foi '%{actual}'"
       check_last_query_fails: "a consulta deve falhar, mas passou"
-      check_last_query_matches: "A consulta não corresponde a regex %{regex}"
+      check_last_query_matches: "A consulta não corresponde a regex %{regexp}"
       check_last_query_outputs: "O resultado da consulta deve ser '%{expected}', mas foi '%{actual}'"
       check_last_query_includes: "O resultado da consulta deve incluir '%{expected}', mas foi '%{actual}'"
       check_last_query_like: "O resultado da consulta deve ser como '%{expected}', mas foi '%{actual}'"
@@ -14,4 +14,5 @@ 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"
       goal_passed: "O objetivo foi alcançado com sucesso"

data/lib/mumukit/error_pattern.rb

@@ -7,7 +7,7 @@ module Mumukit
     end
 
     def matches?(result, status)
-      @status.like?(status) && @regexp.matches?(result)
+      @status.like?(status) && @regexp.match?(result)
     end
 
     def sanitize(result)

data/lib/mumukit/metatest/interactive_checker.rb

@@ -1,25 +1,33 @@
 module Mumukit::Metatest
   class InteractiveChecker < Checker
 
-    def initialize(request)
+    def initialize(request, strip_mode: :left_and_right)
       @request = request
+      @strip_mode = strip_mode
     end
 
     def check_last_query_equals(_result, goal)
       expected = goal[:value]
-      actual = @request.query.strip
+      actual = query
       fail_t :check_last_query_equals, expected: expected, actual: actual unless expected == actual
     end
 
     def check_last_query_matches(_result, goal)
-      regex = goal[:regexp]
-      fail_t :check_last_query_matches, regex: regex.inspect unless regex.matches? @request.query
+      regexp = goal[:regexp]
+      fail_t :check_last_query_matches, regexp: regexp.inspect unless query.match?(regexp)
     end
 
     def check_last_query_fails(result, _goal)
       fail_t :check_last_query_fails unless result[:query][:status].failed?
     end
 
+    def check_queries_match(result, goal)
+      queries = [query] + @request.cookie.to_a
+      fail_t :check_queries_match unless goal[:regexps].all? do |regexp|
+        queries.any? { |query| query.match? regexp }
+      end
+    end
+
     def check_last_query_outputs(result, goal)
       compare_last_query_by(:check_last_query_outputs, result, goal) { |expected, actual| expected == actual }
     end
@@ -72,5 +80,11 @@ module Mumukit::Metatest
       a_string.delete(" \t\r\n").downcase
     end
 
+    private
+
+    def query
+      query_s = @request.query.to_s
+      @strip_mode == :right_only ? query_s.rstrip : query_s.strip
+    end
   end
 end

data/lib/mumukit/templates/try_hook.rb

@@ -4,7 +4,7 @@ module Mumukit
       request_goal = request.goal.with_indifferent_access
 
       @goal = {postconditions: [[request_goal[:kind], request_goal]]}
-      @checker = Metatest::InteractiveChecker.new request
+      @checker = checker_for request
       super request
     end
 
@@ -14,6 +14,14 @@ module Mumukit
       [check_results[2], check_results[1], structured_results[:query]]
     end
 
+    def checker_for(request)
+      Metatest::InteractiveChecker.new request, **checker_options
+    end
+
+    def checker_options
+      {}
+    end
+
     required :to_structured_results
   end
 end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.40.0'
+  VERSION = '2.41.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.41.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler