mumuki-laboratory 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f824531443ee3ee14cf97a2acbd049f9d611d8
-  data.tar.gz: eb6344fdc81b6d5358653b1dfc129e3fe55bae25
+  metadata.gz: 4948fb4a53aa2b8a644d30e277ba22e36c97f288
+  data.tar.gz: d8eb048fc90d467600a0ece58095e09475c82df3
 SHA512:
-  metadata.gz: 56129d9c051b1f8013b1d557fbc5798fb4b1aaa4d8f4f15022d2a34594bd0f2fa0b835ebb83c53f5803d7344893d7431c759c0bc5df123e50453b5368e3aaf55
-  data.tar.gz: dc1defcca5fb41a697633734b79c41525143f78b90eec70e33bdcd0dffdce2a73ab3deb5b6ba325bfe2df04a7e885512e88fa1d223750900ac8a2182eda28126
+  metadata.gz: 56267fa13ab108b5eb6b2fef47b0b51abe837c09783e7189b59f3f4afa6dcfeac1886ee8f7a50cc9ef208a999c90d0e17ecdbc40b7990050b7f1db0d85da765c
+  data.tar.gz: 882babf2c0a112c9682637910378db3612121b8e8448ac27f80095b8b4aec2453a5ba907d503a74776aeb415fa233aa22071b1c1cd6a2fdc33882e3f4b12aa8b

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.1.3'
+    VERSION = '6.1.4'
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181117190241) do
+ActiveRecord::Schema.define(version: 20181121165956) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -158,7 +158,7 @@ ActiveRecord::Schema.define(version: 20181117190241) do
     t.boolean "new_expectations", default: false
     t.boolean "manual_evaluation", default: false
     t.integer "editor", default: 0, null: false
-    t.string "choices", default: [], null: false, array: true
+    t.string "choice_values", default: [], null: false, array: true
     t.text "goal"
     t.string "initial_state"
     t.string "final_state"
@@ -166,6 +166,7 @@ ActiveRecord::Schema.define(version: 20181117190241) do
     t.text "randomizations"
     t.text "free_form_editor_source"
     t.text "teacher_info"
+    t.text "choices"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end

data/spec/features/exercise_flow_spec.rb

@@ -12,7 +12,7 @@ feature 'Exercise Flow', organization_workspace: :test do
   let!(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
   let!(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
   let!(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
-  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: ['some choice']) }
+  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: [{value: 'some choice', checked: true}]) }
   let!(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
   let!(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -7,10 +7,10 @@ describe BreadcrumbsHelper, organization_workspace: :test do
   helper ERB::Util
 
   context 'user' do
-    let(:user) { create(:user) }
+    let(:user) { create(:user, first_name: "Alfonsina", last_name: "Storni") }
     let(:breadcrumb) { breadcrumbs(user) }
 
-    it { expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>#{user.name}</li>" }
+    it { expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>Alfonsina Storni</li>" }
   end
 
   context 'exercise' do

data/spec/helpers/with_choices_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ChoicesHelper do
   helper ChoicesHelper
 
-  context 'exercise width choices' do
+  context 'exercise with choices' do
     let(:checked_content) { struct id: '1', index: 0, value: 'foo', text: 'bar' }
     let(:unchecked_content) { struct id: '3', index: 2, value: 'baz', text: 'lorem' }
     let(:content) { '0:1' }

data/spec/models/exercise_spec.rb

@@ -4,6 +4,30 @@ describe Exercise, organization_workspace: :test do
   let(:exercise) { create(:exercise) }
   let(:user) { create(:user, first_name: 'Orlo') }
 
+  describe '#choice_values' do
+    context 'when choices are in 5.0 format' do
+      let(:choice_values) { %w(1492 1453 1773)  }
+      let(:exercise) { build(:exercise, description: 'when did byzantine empire fall?', choice_values: choice_values) }
+
+      it { expect(exercise.choices).to be_blank }
+      it { expect(exercise[:choice_values]).to eq choice_values }
+      it { expect(exercise.choice_values).to eq choice_values }
+      it { expect(exercise.choice_index_for '1492').to eq 0 }
+      it { expect(exercise.choice_index_for '1773').to eq 2 }
+    end
+
+    context 'when choices are in 6.0 format' do
+      let(:choices) { [{value: '1492', checked: false}, {value: '1453', checked: true}, {value: '1773', checked: false}] }
+      let(:exercise) { build(:exercise, description: 'when did byzantine empire fall?', choices: choices) }
+
+      it { expect(exercise.choices).to eq choices }
+      it { expect(exercise[:choice_values]).to be_blank }
+      it { expect(exercise.choice_values).to eq %w(1492 1453 1773) }
+      it { expect(exercise.choice_index_for '1492').to eq 0 }
+      it { expect(exercise.choice_index_for '1773').to eq 2 }
+    end
+  end
+
   describe '#slug' do
     let(:guide) { create(:guide, slug: 'foo/bar') }
     let(:exercise) { create(:exercise, guide: guide, bibliotheca_id: 4) }

data/spec/models/guide_import_spec.rb

@@ -55,7 +55,7 @@ describe Guide do
           extra: '',
           language: { name: 'text' },
           test: "---\nequal: '1'\n",
-          choices: [{value: 'foo', checked: false}, {value: 'bar', chekced: true}],
+          choices: [{value: 'foo', checked: false}, {value: 'bar', checked: true}],
           extra_visible: false,
           id: 8},
          {type: 'reading',
@@ -148,7 +148,8 @@ describe Guide do
       it { expect(guide.exercises.second.language).to eq haskell }
       it { expect(guide.exercises.second.default_content).to eq 'a default content' }
       it { expect(guide.exercises.second.extra_visible).to be true }
-      it { expect(guide.exercises.fourth.choices).to eq ['foo', 'bar'] }
+      it { expect(guide.exercises.fourth.choices).to eq [{'value' => 'foo', 'checked' => false}, {'value' => 'bar', 'checked' => true}] }
+      it { expect(guide.exercises.fourth.choice_values).to eq ['foo', 'bar'] }
 
       it { expect(guide.exercises.third.expectations.first['binding']).to eq 'foo' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement