mumuki-laboratory 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38780814278c34989e9d89e4ef78364eb0b5e8ccca49e772414fe7e0b02c166
-  data.tar.gz: 37e8c5cb9a0cc951b83f1905e2d7b309896a24fc2d839935c30676c3360cce2a
+  metadata.gz: 34a309d23781b16429c67d4898ec3522ea8cc921c5980a8be22d8c10d29aa74b
+  data.tar.gz: ea53886235870295a9821b84ef509f6a2b50cb20411c4eef368e9a0cd5851bf8
 SHA512:
-  metadata.gz: 6c8f2296e19c21428a37d6e46abdba9e19dab518b262a149c8de6bc66d3bf9aabb84baeed171cc7aed3b1ac5e706355d46bf9200da4e4f6791a4d202891156ff
-  data.tar.gz: 87708300550f167df2bbba5f50ab9bec08e60b5513f38d7f7af9121b8391ae432b974151b913d89aa93956ffeff7dc331f7a81973a1f187a8cc36730fc7ea0a3
+  metadata.gz: fa4ac32fd357aae1f45a1e999d49d0d7aca17f3eb183930725cd49bf9c9f86f71c9fd7da25b63313900e98511b27477d8a5b49dc4857487ac3e29a9a7f4b33e0
+  data.tar.gz: 3cf087f36868a799843bfdc651501ab70489cc2671e62c96b2f19578bbe5c07e1db46a00dda4972400db9f1ec3c1c4d438733a1139318282a107f6f567789bd8

data/app/helpers/contextualization_result_helper.rb

@@ -1,6 +1,10 @@
 module ContextualizationResultHelper
   def humanized_expectation_result_item(expectation_result)
-    %Q{<li>#{status_icon(expectation_result[:result])} #{sanitized expectation_result[:explanation]}</li>}.html_safe
+    %Q{<li>#{status_icon(expectation_result[:result])} #{humanized_expectation_explanation expectation_result}</li>}.html_safe
+  end
+
+  def humanized_expectation_explanation(expectation_result)
+    sanitized Mumukit::ContentType::Markdown.to_html(expectation_result[:explanation], one_liner: true)
   end
 
   def render_feedback?(contextualization)

data/app/views/layouts/modals/_kids_context.html.erb

@@ -4,6 +4,8 @@
       <div class="modal-header">
         <h4 class="text-center">
           <strong><%= "#{exercise.number}. #{exercise.name}" %></strong>
+          <%= teacher_info_button exercise %>
+          <%= link_to_bibliotheca_exercise exercise %>
         </h4>
       </div>
       <div class="modal-body">

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.2.0'
+    VERSION = '7.3.0'
   end
 end

data/spec/helpers/test_results_rendering_spec.rb

@@ -3,54 +3,81 @@ require 'ostruct'
 
 describe ContextualizationResultHelper do
   helper IconsHelper
+  helper FontAwesome::Rails::IconHelper
   helper ContextualizationResultHelper
 
-  let(:html) { render_test_results contextualization }
 
-  context 'structured results' do
-    context 'when single passed submission' do
-      let(:contextualization) { struct(
-        exercise: struct(hidden?: false),
-        test_results: [{title: '2 is 2', status: :passed, result: ''}],
-        output_content_type: Mumukit::ContentType::Plain) }
+  describe 'humanized_expectation_result_item' do
+    let(:html) { humanized_expectation_result_item expectation_result }
 
-      it { expect(html).to be_html_safe }
-      it { expect(html).to include "<i class=\"fa fa-check-circle text-success status-icon\"></i>" }
-      it { expect(html).to include "2 is 2" }
+    context 'plain explanation' do
+      let(:expectation_result) { {result: :failed, explanation: 'you must delegate'} }
+
+      it { expect(html).to eq '<li><i class="fa fa-times-circle text-danger status-icon"></i> you must delegate</li>' }
+
+    end
+
+    context 'html explanation' do
+      let(:expectation_result) { {result: :failed, explanation: 'you must use <strong>if</strong>'} }
+
+      it { expect(html).to eq '<li><i class="fa fa-times-circle text-danger status-icon"></i> you must use <strong>if</strong></li>' }
+    end
+
+    context 'markdown explanation' do
+      let(:expectation_result) { {result: :failed, explanation: 'you must call `fooBar`'} }
+
+      it { expect(html).to eq '<li><i class="fa fa-times-circle text-danger status-icon"></i> you must call <code>fooBar</code></li>' }
     end
+  end
+
+  describe 'render_test_results' do
+    let(:html) { render_test_results contextualization }
 
-    context 'when single failed submission' do
-      context 'when plain results' do
+    context 'structured results' do
+      context 'when single passed submission' do
         let(:contextualization) { struct(
           exercise: struct(hidden?: false),
-          test_results: [{title: '2 is 2', status: :failed, result: 'something _went_ wrong'}],
+          test_results: [{title: '2 is 2', status: :passed, result: ''}],
           output_content_type: Mumukit::ContentType::Plain) }
 
-        it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
-        it { expect(html).to include "<strong class=\"example-title\">2 is 2</strong>" }
-        it { expect(html).to include "<pre>something _went_ wrong</pre>" }
+        it { expect(html).to be_html_safe }
+        it { expect(html).to include "<i class=\"fa fa-check-circle text-success status-icon\"></i>" }
+        it { expect(html).to include "2 is 2" }
       end
 
-      context 'when markdown results' do
-        let(:contextualization) { struct(
-          exercise: struct(hidden?: false),
-          test_results: [{title: '2 is 2', status: :failed, result: 'something went _really_ wrong'}],
-          output_content_type: Mumukit::ContentType::Markdown) }
+      context 'when single failed submission' do
+        context 'when plain results' do
+          let(:contextualization) { struct(
+            exercise: struct(hidden?: false),
+            test_results: [{title: '2 is 2', status: :failed, result: 'something _went_ wrong'}],
+            output_content_type: Mumukit::ContentType::Plain) }
+
+          it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
+          it { expect(html).to include "<strong class=\"example-title\">2 is 2</strong>" }
+          it { expect(html).to include "<pre>something _went_ wrong</pre>" }
+        end
+
+        context 'when markdown results' do
+          let(:contextualization) { struct(
+            exercise: struct(hidden?: false),
+            test_results: [{title: '2 is 2', status: :failed, result: 'something went _really_ wrong'}],
+            output_content_type: Mumukit::ContentType::Markdown) }
 
-        it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
-        it { expect(html).to include "<strong class=\"example-title\">2 is 2</strong>" }
-        it { expect(html).to include "<p>something went <em>really</em> wrong</p>" }
+          it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
+          it { expect(html).to include "<strong class=\"example-title\">2 is 2</strong>" }
+          it { expect(html).to include "<p>something went <em>really</em> wrong</p>" }
+        end
       end
     end
-  end
 
-  context 'unstructured results' do
-    let(:contextualization) { struct(
-      exercise: struct(hidden?: false),
-      result_html: '<pre>ooops, something went wrong</pre>'.html_safe) }
+    context 'unstructured results' do
+      let(:contextualization) { struct(
+        exercise: struct(hidden?: false),
+        result_html: '<pre>ooops, something went wrong</pre>'.html_safe) }
 
-    it { expect(html).to be_html_safe }
-    it { expect(html).to include '<pre>ooops, something went wrong</pre>' }
-    it { expect(html).to include '<strong>Results:</strong>' }
+      it { expect(html).to be_html_safe }
+      it { expect(html).to include '<pre>ooops, something went wrong</pre>' }
+      it { expect(html).to include '<strong>Results:</strong>' }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.3.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.7'
+- !ruby/object:Gem::Dependency
+  name: mumukit-content-type
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: mumuki-styles
   requirement: !ruby/object:Gem::Requirement