mumuki-laboratory 7.3.0 → 7.5.0

data/lib/mumuki/laboratory/locales/pt.yml

@@ -18,7 +18,8 @@ pt:
   ask_the_first_question: Faça a primeira pergunta!
   attempts_left:
     zero: 'Você ficou sem tentativas'
-    other: '%{count} tentativa restante'
+    one: '1 tentativa restante'
+    other: '%{count} tentativas restantes'
   author: Autor
   authoring: Autores
   authoring_note_html: 'Este guia foi desenvolvido por %{authors} nos termos do <a href = "https://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> Creative Commons License Share-Equal, 4.0 </a>.'
@@ -37,6 +38,7 @@ pt:
   closed_count: '%{count} fechado'
   comment: Comentar
   confirm: Confirme
+  confirm_reset: Você está prestes a reiniciar seu exercício. Você quer continuar?
   confirm_restart: Você está prestes a apagar o seu progresso neste guia. Você quer continuar?
   console: Consola
   contact_administrator: Se você acha que é um erro, entre em contato com a pessoa que gerencia essa organização %{link}
@@ -55,9 +57,10 @@ pt:
   day: Dia
   days: Dias
   description: Descrição
-  destroy: Excluir
   destroy_message: excluir a mensagem
+  destroy: Excluir
   details: Detalhes
+  disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -88,6 +91,7 @@ pt:
   finish: Terminar
   first_name: Nome
   forbidden_explanation: Isso significa que você não tem autorização para ver esse conteúdo. <br> Você poderia ter entrado com uma conta incorreta?
+  format: Formato
   fullscreen: Tela completa
   gender: Gênero
   get_messages: Ver mensagens
@@ -192,6 +196,7 @@ pt:
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar
   results: Resultados
+  results_hidden: Sua solução foi enviada com sucesso!
   retry_exercise: Tentar novamente
   running: processamento
   save: Salvar
@@ -202,6 +207,10 @@ pt:
   sign_in_action: iniciar sessão
   sign_out: Fechar Sessão
   sign_up_date: Usuário de
+  skipped: Você está aprendendo muito bem e passou neste exercício.
+  skipped_congratulations: Bem feito!
+  skipped_description: Você está aprendendo muito bem e passou neste exercício.
+  skipped_solve_anyway: Resolver mesmo assim
   solution: Solução
   solved: Resolvido
   solved_count: '%{count} resolvido'

data/lib/mumuki/laboratory/version.rb

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

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -16,23 +16,37 @@ describe ExerciseSolutionsController, organization_workspace: :test do
     post :create, params: { exercise_id: problem.id, solution: { content: 'asd' } }
   end
 
+
   describe 'when simple content is sent' do
-    before { post_problem(problem) }
+    context 'for a non-kids exercise' do
+      before { post_problem(problem) }
+      let(:assignment) { Assignment.last }
 
-    it { expect(response.status).to eq 200 }
-    it { expect(Assignment.last.solution).to eq('asd')}
+      context 'without client-side interpolations' do
+        it { expect(response.status).to eq 200 }
+        it { expect(assignment.solution).to eq('asd')}
 
-    context 'for a non-kids exercise' do
-      it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                            except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
+        it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
+                                              except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
 
-      it 'does not include kids specific renders' do
-        body = JSON.parse(response.body)
 
-        expect(body.key?('button_html')).to be false
-        expect(body.key?('title_html')).to be false
-        expect(body.key?('expectations_html')).to be false
-        expect(body.key?('test_results')).to be false
+        it 'does not include kids specific renders' do
+          body = JSON.parse(response.body)
+
+          expect(body.key?('button_html')).to be false
+          expect(body.key?('title_html')).to be false
+          expect(body.key?('expectations_html')).to be false
+          expect(body.key?('test_results')).to be false
+        end
+      end
+
+      context 'with client-side interpolations' do
+        let(:problem) { create(:problem, extra: interpolation) }
+        let(:interpolation) { %q{function longitud(unString) /*<elipsis-for-student@*/ {
+          return unString.length;
+        } /*@elipsis-for-student>*/} }
+
+        it { expect(assignment.extra.strip).to eq interpolation.strip }
       end
     end
 
@@ -41,15 +55,16 @@ describe ExerciseSolutionsController, organization_workspace: :test do
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
                                             except: [:class_for_progress_list_item, :html, :remaining_attempts_html,
-                                                     :title_html, :button_html, :expectations_html, :test_results]) }
+                                                     :title_html, :button_html, :expectations, :test_results, :tips]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)
 
         expect(body.key?('button_html')).to be true
         expect(body.key?('title_html')).to be true
-        expect(body.key?('expectations_html')).to be true
+        expect(body.key?('expectations')).to be true
         expect(body.key?('test_results')).to be true
+        expect(body.key?('tips')).to be true
       end
     end
   end

data/spec/controllers/users_api_controller_spec.rb

@@ -35,6 +35,7 @@ describe Api::UsersController, type: :controller, organization_workspace: :base
     it { expect(User.count).to eq 2 }
     it { expect(User.last.student? 'test/_').to be true }
     it { expect(User.last.uid).to eq 'foo@bar.com' }
+    it { expect(User.last.verified_first_name).to eq 'foo' }
   end
 
 

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe UsersController, type: :controller, organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:user_json) do
+    {
+      first_name: 'foo',
+      last_name: 'bar',
+      email: 'foo@bar.com'
+    }
+  end
+
+  context 'put' do
+    before { set_current_user! user }
+    before { put :update, body: { user: user_json }.to_json, as: :json }
+
+    it { expect(User.last.first_name).to eq 'foo' }
+    it { expect(User.last.verified_first_name).to be_nil }
+  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: 20200213175736) do
+ActiveRecord::Schema.define(version: 20200527180729) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,6 +51,11 @@ ActiveRecord::Schema.define(version: 20200213175736) do
     t.index ["submitter_id"], name: "index_assignments_on_submitter_id"
   end
 
+  create_table "avatars", force: :cascade do |t|
+    t.string "image_url"
+    t.string "description"
+  end
+
   create_table "books", id: :serial, force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
@@ -137,6 +142,7 @@ ActiveRecord::Schema.define(version: 20200213175736) do
     t.integer "duration"
     t.integer "max_problem_submissions"
     t.integer "max_choice_submissions"
+    t.boolean "results_hidden_for_choices", default: false
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"
@@ -366,6 +372,9 @@ ActiveRecord::Schema.define(version: 20200213175736) do
     t.integer "gender"
     t.string "verified_first_name"
     t.string "verified_last_name"
+    t.bigint "avatar_id"
+    t.datetime "disabled_at"
+    t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"
     t.index ["uid"], name: "index_users_on_uid", unique: true
   end

data/spec/dummy/db/seeds.rb

@@ -16,9 +16,17 @@ Organization.find_or_create_by!(name: 'private') do |org|
   org.public = false
 end
 
+  Organization.find_or_create_by!(name: 'primaria') do |org|
+    org.book = Book.find_by!(slug: 'mumukiproject/mumuki-libro-primaria')
+    org.login_methods = Mumukit::Login::Settings.login_methods
+    org.public = true
+  end
+
 Organization.find_or_create_by!(name: 'central')
 
 User.find_or_create_by!(uid: 'dev.student@mumuki.org') { |org| org.permissions = {student: 'central/*'} }
 User.find_or_create_by!(uid: 'dev.teacher@mumuki.org') { |org| org.permissions = {teacher: 'private/*'} }
 User.find_or_create_by!(uid: 'dev.admin@mumuki.org') { |org| org.permissions = {admin: '*/*'} }
 User.find_or_create_by!(uid: 'dev.owner@mumuki.org') { |org| org.permissions = {owner: '*/*'} }
+
+Avatar.create!(image_url: 'user_shape.png')

data/spec/features/disable_user_flow_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+feature 'disable user flow', organization_workspace: :test do
+  let!(:current_organization) { Organization.current }
+  let(:user) { create(:user) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [
+      create(:lesson, guide: create(:guide))]) }
+
+  let(:book) { current_organization.book }
+
+  before { reindex_current_organization! }
+
+  before { set_current_user! user }
+
+    scenario 'enabled visitor' do
+      visit '/'
+
+      expect(page).to have_text('ム mumuki')
+      expect(page).to have_text(current_organization.book.name)
+      expect(user.reload.last_organization).to eq current_organization
+    end
+
+    scenario 'disable visitor' do
+      user.disable!
+
+      visit '/'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text('You are trying to visit a permamently disabled or deleted resource')
+    end
+end

data/spec/features/exams_flow_spec.rb

@@ -7,11 +7,22 @@ feature 'Exams Flow', organization_workspace: :test do
 
   let(:other_organization) { create(:organization, name: 'baz') }
 
-  let(:exam_with_no_submission_limits) { create(:exam, organization_id: Organization.find_by_name('test').id, guide_id: guide.id) }
+  let(:test_organization) { Organization.locate! 'test' }
+  let(:exam_with_no_submission_limits) { create(:exam, organization: test_organization, guide: guide) }
+
+  let(:capped_exam) { create(:exam, organization: test_organization, guide: problems_guide, max_choice_submissions: 2, max_problem_submissions: 5) }
+
   let(:guide) { create(:guide, exercises: [exercise])}
   let(:exercise) { create(:exercise, name: 'Exam Exercise') }
 
-  before { exam_with_no_submission_limits.index_usage! Organization.find_by_name('test') }
+  let(:problems_guide) { create(:guide, exercises: [choice_problem, code_problem])}
+
+  let(:choice_problem) { create(:problem, name: 'Exam Choice Problem', editor: :multiple_choice,
+    choices: [{ value: "A", checked: true }, { value: "B", checked: false }]) }
+
+  let(:code_problem) { create(:problem, name: 'Exam Code Problem') }
+
+  before { exam_with_no_submission_limits.index_usage! test_organization }
 
   before { reindex_current_organization! }
 
@@ -44,22 +55,82 @@ feature 'Exams Flow', organization_workspace: :test do
     expect(page).to have_text('You have no permissions for this content.')
   end
 
-  scenario 'visit exam in path, when there is no more time' do
-    user = create(:user)
-    set_current_user! user
-    exam.authorize!(user)
-    expect_any_instance_of(Exam).to receive(:enabled_for?).and_return(false)
-    visit "/exams/#{exam.classroom_id}"
+  context 'visit authorized exam for user' do
+    let(:user) { create(:user) }
+    let(:current_exam) { exam }
 
-    expect(page).to have_text('This content is no longer available.')
-  end
+    before do
+      current_exam.authorize! user
+      set_current_user! user
+    end
+
+    scenario 'in path, when there is no more time' do
+      expect_any_instance_of(Exam).to receive(:enabled_for?).and_return(false)
+      visit "/exams/#{current_exam.classroom_id}"
+
+      expect(page).to have_text('This content is no longer available.')
+    end
 
-  scenario 'visit exercise for exam with no submission limits' do
-    user = create(:user)
-    set_current_user! user
-    exam_with_no_submission_limits.authorize!(user)
-    visit "/exercises/#{exercise.id}"
+    feature 'with no submission limits' do
+      let(:current_exam) { exam_with_no_submission_limits }
+
+      scenario 'in a particular exercise' do
+        visit "/exercises/#{exercise.id}"
+
+        expect(page).to have_text('Exam Exercise')
+      end
+    end
 
-    expect(page).to have_text('Exam Exercise')
+    feature 'with submission limits' do
+      let(:current_exam) { capped_exam }
+
+      feature 'when user has no remaining attempts' do
+        feature 'for code problem' do
+          before { 5.times { code_problem.submit_solution!(user, content: 'foo')  } }
+
+          scenario do
+            visit "/exercises/#{code_problem.id}"
+
+            expect(page).to have_text('Exam Code Problem')
+            expect(page).to have_text('out of attempts')
+          end
+        end
+
+        feature 'for choice problem' do
+          before { 2.times { choice_problem.submit_solution!(user, content: 'foo')  } }
+
+          scenario do
+            visit "/exercises/#{choice_problem.id}"
+
+            expect(page).to have_text('Exam Choice Problem')
+            expect(page).to have_text('out of attempts')
+          end
+        end
+      end
+
+      feature 'when user has remaining attempts' do
+        feature 'for code problem' do
+          before { 2.times { code_problem.submit_solution!(user, content: 'foo') } }
+
+          scenario do
+            visit "/exercises/#{code_problem.id}"
+
+            expect(page).to have_text('Exam Code Problem')
+            expect(page).to have_text('3 attempts remaining')
+          end
+        end
+
+        feature 'for choice problem' do
+          before { 1.times { choice_problem.submit_solution!(user, content: 'foo') } }
+
+          scenario do
+            visit "/exercises/#{choice_problem.id}"
+
+            expect(page).to have_text('Exam Choice Problem')
+            expect(page).to have_text('1 attempt remaining')
+          end
+        end
+      end
+    end
   end
 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: [{value: 'some choice', checked: true}]) }
+  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', editor: :single_choice, 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

@@ -71,6 +71,32 @@ describe BreadcrumbsHelper, organization_workspace: :test do
     end
   end
 
+  context 'discussion' do
+    let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson]) }
+    let(:lesson) { create(:lesson, name: 'my lesson', exercises: [exercise]) }
+    let(:exercise) { create(:exercise, name: 'my exercise') }
+
+    let(:discussion) { create(:discussion, item: debatable) }
+    let(:breadcrumb) { breadcrumbs_for_discussion(discussion, debatable) }
+
+    before { reindex_current_organization! }
+
+    context 'in exercise' do
+      let(:debatable) { exercise }
+
+      it 'breadcrumb goes mumuki / test organization / chapter / lesson / exercise / discussions / discussion' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to include('test')
+        expect(breadcrumb).to include('my chapter')
+        expect(breadcrumb).to include('my lesson')
+        expect(breadcrumb).to include('my exercise')
+        expect(breadcrumb).to include('discussions')
+        expect(breadcrumb).to include(discussion.title)
+        expect(breadcrumb).to be_html_safe
+      end
+    end
+  end
+
   context 'book' do
     let(:breadcrumb) { header_breadcrumbs(link_for_organization: false) }
 

data/spec/helpers/test_results_rendering_spec.rb

@@ -7,26 +7,19 @@ describe ContextualizationResultHelper do
   helper ContextualizationResultHelper
 
 
-  describe 'humanized_expectation_result_item' do
-    let(:html) { humanized_expectation_result_item expectation_result }
+  describe 'render_affable_expectation_result' do
+    let(:html) { render_affable_expectation_result expectation_result }
 
     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>' }
-
+      it { expect(html).to eq '<i class="fa fa-times-circle text-danger status-icon"></i> you must delegate' }
     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>' }
+      it { expect(html).to eq '<i class="fa fa-times-circle text-danger status-icon"></i> you must use <strong>if</strong>' }
     end
   end
 
@@ -35,10 +28,11 @@ describe ContextualizationResultHelper 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: :passed, result: ''}],
-          output_content_type: Mumukit::ContentType::Plain) }
+        let(:language) { build(:language, output_content_type: :plain) }
+        let(:problem) { build(:problem, language: language) }
+        let(:contextualization) { Assignment.new(
+          exercise: problem,
+          test_results: [{title: '2 is 2', status: :passed, result: ''}]) }
 
         it { expect(html).to be_html_safe }
         it { expect(html).to include "<i class=\"fa fa-check-circle text-success status-icon\"></i>" }
@@ -47,33 +41,61 @@ describe ContextualizationResultHelper do
 
       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) }
+          let(:language) { build(:language, output_content_type: :plain) }
+          let(:problem) { build(:problem, language: language) }
+          let(:contextualization) { Assignment.new(
+            exercise: problem,
+            test_results: [{title: '2 is 2', status: :failed, result: 'something _went_ wrong'}]) }
 
           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 "2 is 2" }
           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) }
+          let(:language) { build(:language, output_content_type: :markdown) }
+          let(:problem) { build(:problem, language: language) }
+          let(:contextualization) { Assignment.new(
+            exercise: problem,
+            test_results: [{title: '2 is 2', status: :failed, result: 'something went _really_ wrong'}]) }
 
           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 "2 is 2" }
           it { expect(html).to include "<p>something went <em>really</em> wrong</p>" }
         end
+
+        context 'when markdown results with summary and title' do
+          let(:language) { build(:language, output_content_type: :markdown) }
+          let(:problem) { build(:problem, language: language) }
+          let(:contextualization) { Assignment.new(
+            exercise: problem,
+            test_results: [{title: 'foo is 2', status: :failed, result: 'foo is undefined', summary: {type: 'undefined_variable', message: 'you are using things that are _not defined_'}}]) }
+
+          it { expect(html).to include 'foo is 2: you are using things that are <em>not defined</em>' }
+          it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
+          it { expect(html).to include '<p>foo is undefined</p>' }
+        end
+
+        context 'when markdown results with summary and no title' do
+          let(:language) { build(:language, output_content_type: :markdown) }
+          let(:problem) { build(:problem, language: language) }
+          let(:contextualization) { Assignment.new(
+            exercise: problem,
+            test_results: [{title: '', status: :failed, result: 'foo is undefined', summary: {type: 'undefined_variable', message: 'you are using things that are _not defined_'}}]) }
+
+          it { expect(html).to include 'you are using things that are <em>not defined</em>' }
+          it { expect(html).to include "<i class=\"fa fa-times-circle text-danger status-icon\"></i>" }
+          it { expect(html).to include '<p>foo is undefined</p>' }
+        end
       end
     end
 
     context 'unstructured results' do
-      let(:contextualization) { struct(
-        exercise: struct(hidden?: false),
-        result_html: '<pre>ooops, something went wrong</pre>'.html_safe) }
+      let(:language) { build(:language, )}
+      let(:problem) { build(:problem, language: language) }
+      let(:contextualization) { Assignment.new(
+        exercise: problem,
+        result: 'ooops, something went wrong'.html_safe) }
 
       it { expect(html).to be_html_safe }
       it { expect(html).to include '<pre>ooops, something went wrong</pre>' }