mumuki-laboratory 7.6.2 → 7.7.4

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

@@ -11,6 +11,7 @@ es:
   and: y
   appendix: "Apéndice"
   appendix_teaser: ¿Querés saber más? <a href="%{link}">Consultá el apéndice de este capítulo</a>
+  approved_message: Validado por mentor
   are_you_sure: '¿Estás seguro que querés %{action}?'
   ask_a_question: ¡Hacé una pregunta!
   ask_community: Preguntá a la comunidad
@@ -65,6 +66,7 @@ es:
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
   disabled_organization_explanation: ¡Este recorrido ha finalizado!
+  discussion_description_placeholder: Podés agregar información para detallar más tu consulta
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -123,6 +125,7 @@ es:
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solución
   latest_exercises: Últimos ejercicios
   learning: Aprendizaje
@@ -144,7 +147,7 @@ es:
   minute: minuto
   minutes: minutos
   more_messages: Ver mensajes anteriores
-  moderator: Moderador
+  moderator: Mentor
   mumuki_catchphrase: Aprendé a programar
   mumuki_short_description: Mumuki es la plataforma libre y gratuita para aprender a programar, de la práctica a la teoría y en tu idioma
   my_doubts: Mis consultas
@@ -202,7 +205,10 @@ es:
   read: Leido
   read_messages: Ver mensajes
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
+  requires_attention: Requiere atención
   reset_query: Borrar los filtros de búsqueda actuales
+  responses_count_asc: Con menos respuestas validadas
+  responses_count_desc: Con más respuestas validadas
   restart: Reiniciar
   results_hidden: ¡Tu solución fue enviada con éxito!
   results: Resultados

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

@@ -11,6 +11,7 @@ pt:
   and: e
   appendix: Apêndice
   appendix_teaser: Você quer saber mais? <a href="%{link}"> Consulte o apêndice deste capítulo </a>
+  approved_message: Validado pelo mentor
   are_you_sure: 'Tem certeza de que deseja %{action}?'
   ask_a_question: Faça uma pergunta!
   ask_community: Pergunte à comunidade
@@ -62,6 +63,7 @@ pt:
   details: Detalhes
   disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
   disabled_organization_explanation: Este curso terminou!
+  discussion_description_placeholder: Você pode adicionar mais informações sobre sua dúvida
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -119,6 +121,7 @@ pt:
   language: Linguagem
   languages: Linguagens
   last_name: Sobrenome
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solução
   latest_exercises: Últimos exercícios
   learning: Aprendendo
@@ -132,15 +135,15 @@ pt:
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
-      one: 1 mensagem
-      other: '%{count} mensagens'
+    one: 1 mensagem
+    other: '%{count} mensagens'
   message: Mensagem
   messages: Mensagens
   messages_error: As mensagens acima não estão disponíveis no momento. Eu tentei novamente mais tarde!
   minute: minuto
   minutes: minutos
   more_messages: Ver as mensagens anteriores
-  moderator: Moderador
+  moderator: Mentor
   mumuki_catchphrase: Aprendi a programar
   mumuki_short_description: Mumuki é a plataforma gratuita e gratuita para aprender a programar, desde a prática até a teoria e no seu idioma
   my_doubts: Minhas duvidas
@@ -162,7 +165,7 @@ pt:
   no_messages: Parece que você ainda não tem uma mensagem!
   no_questions: Parece que ainda não há dúvida.
   no_submissions: Parece que você ainda não tentou resolver este exercício!
-  no_useful_result: Didn't find what you were looking for
+  no_useful_result: Não encontrou o que estava buscando?
   not_found: A página que você pesquisou não existe!
   not_found_explanation: Olhe se você escreveu o endereço corretamente. Mas...
   not_in_any_organizations: Parece que você ainda não está em nenhuma organização!
@@ -195,6 +198,7 @@ pt:
   read: Ler
   read_messages: Ver mensagens
   refresh_or_wait: Se não mostrar automaticamente em alguns segundos, pressione F5
+  requires_attention: Requer atenção
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar
   results: Resultados

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.6.2'
+    VERSION = '7.7.4'
   end
 end

data/spec/controllers/confirmations_controller_spec.rb

@@ -15,6 +15,6 @@ describe ExerciseConfirmationsController, organization_workspace: :test do
     before { post :create, params: { exercise_id: reading.id } }
 
     it { expect(response.status).to eq 200 }
-    it { expect(response.body).to json_like(guide_finished_by_solution: true, class_for_progress_list_item: 'progress-list-item text-center success active') }
+    it { expect(response.body).to json_like(guide_finished_by_solution: true) }
   end
 end

data/spec/controllers/discussions_messages_controller_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe DiscussionsMessagesController, organization_workspace: :test do
+  let(:student) { create(:user, permissions: {student: 'test/*'}) }
+  let(:moderator) { create(:user, permissions: {moderator: 'test/*', student: 'test/*'}) }
+
+  let(:exercise) { create(:exercise) }
+  let(:discussion) { create(:discussion, item: exercise, organization: Organization.current) }
+
+  before { Organization.current.update! forum_enabled: true }
+
+  describe 'post' do
+    describe 'for student' do
+      before { set_current_user! student }
+      before { allow_any_instance_of(DiscussionsMessagesController).to receive(:message_params).and_return content: 'Need help' }
+      before { post :create, params: {discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 302 }
+      it { expect(discussion.messages.size).to eq 1 }
+      it { expect(discussion.messages.last.content).to eq 'Need help' }
+    end
+
+    describe 'for moderator' do
+      before { set_current_user! moderator }
+      before { allow_any_instance_of(DiscussionsMessagesController).to receive(:message_params).and_return content: 'Do this!' }
+      before { post :create, params: {discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 302 }
+      it { expect(discussion.messages.size).to eq 1 }
+      it { expect(discussion.messages.last.content).to eq 'Do this!' }
+    end
+  end
+
+  describe 'approve' do
+    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+
+    describe 'for student' do
+      before { set_current_user! student }
+      before { post :approve, params: {id: message.id, discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 403 }
+      it { expect(message.reload.approved).to be false }
+    end
+
+    describe 'for student' do
+      before { set_current_user! moderator }
+      before { post :approve, params: {id: message.id, discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 200 }
+      it { expect(message.reload.approved).to be true }
+    end
+  end
+
+  describe 'question' do
+    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+
+    describe 'for student' do
+      before { set_current_user! student }
+      before { post :question, params: {id: message.id, discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 403 }
+      it { expect(message.reload.not_actually_a_question).to be false }
+    end
+
+    describe 'for student' do
+      before { set_current_user! moderator }
+      before { post :question, params: {id: message.id, discussion_id: discussion.id} }
+
+      it { expect(response.status).to eq 200 }
+      it { expect(message.reload.not_actually_a_question).to be true }
+    end
+  end
+end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ExerciseSolutionsController, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:problem) { create(:problem) }
-  let(:kids_problem) { create(:problem, layout: :input_kids) }
+  let(:kids_problem) { create(:problem, layout: :input_primary) }
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
       create(:lesson, exercises: [problem, kids_problem])
@@ -13,21 +13,56 @@ describe ExerciseSolutionsController, organization_workspace: :test do
   before { set_current_user! user }
 
   def post_problem(problem)
-    post :create, params: { exercise_id: problem.id, solution: { content: 'asd' } }
+    post :create, params: { exercise_id: problem.id, solution: { content: 'the content' } }
   end
 
 
-  describe 'when simple content is sent' do
+  context 'when submission contains client_result' do
+    let(:problem) { create(:problem) }
+    let(:assignment) { Assignment.last }
+
+    before { expect_any_instance_of(Language).to receive(:run_tests!).with(bridge_request) }
+    before do
+      post :create, params: {
+        exercise_id: problem.id,
+        solution: { content: 'the content' },
+        client_result: {
+          status: :passed_with_warnings,
+          test_results: [{title: 'everything works', status: 'passed'}]
+        }
+      }
+    end
+
+    let(:bridge_request) do
+      {
+        content: 'the content',
+        custom_expectations: "\n",
+        expectations: [],
+        extra: "",
+        locale: "en",
+        settings: {},
+        test: "dont care",
+        client_result: {
+          status: 'passed_with_warnings',
+          test_results: [{title: 'everything works', status: 'passed'}]
+        }
+      }
+    end
+
+    it { expect(assignment.solution).to eq 'the content' }
+  end
+
+  context 'when simple content is sent' do
     context 'for a non-kids exercise' do
       before { post_problem(problem) }
       let(:assignment) { Assignment.last }
 
       context 'without client-side interpolations' do
         it { expect(response.status).to eq 200 }
-        it { expect(assignment.solution).to eq('asd')}
+        it { expect(assignment.solution).to eq('the content')}
 
         it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                              except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
+                                              except: [:html, :remaining_attempts_html]) }
 
 
         it 'does not include kids specific renders' do
@@ -54,7 +89,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
       before { post_problem(kids_problem) }
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                            except: [:class_for_progress_list_item, :html, :remaining_attempts_html,
+                                            except: [:html, :remaining_attempts_html,
                                                      :title_html, :button_html, :expectations, :test_results, :tips]) }
 
       it 'includes kids specific renders' do

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: 20200608132959) do
+ActiveRecord::Schema.define(version: 20200731081757) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -117,6 +117,11 @@ ActiveRecord::Schema.define(version: 20200608132959) do
     t.text "manual_evaluation_comment"
     t.integer "upvotes_count", default: 0
     t.bigint "organization_id"
+    t.integer "messages_count", default: 0
+    t.integer "validated_messages_count", default: 0
+    t.boolean "requires_moderator_response", default: true
+    t.string "last_moderator_access_by_id"
+    t.datetime "last_moderator_access_at"
     t.index ["initiator_id"], name: "index_discussions_on_initiator_id"
     t.index ["item_type", "item_id"], name: "index_discussions_on_item_type_and_item_id"
     t.index ["organization_id"], name: "index_discussions_on_organization_id"
@@ -143,7 +148,11 @@ ActiveRecord::Schema.define(version: 20200608132959) do
     t.integer "max_problem_submissions"
     t.integer "max_choice_submissions"
     t.boolean "results_hidden_for_choices", default: false
+    t.bigint "course_id"
+    t.integer "passing_criterion_type", default: 0
+    t.integer "passing_criterion_value"
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
+    t.index ["course_id"], name: "index_exams_on_course_id"
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"
   end
@@ -288,6 +297,7 @@ ActiveRecord::Schema.define(version: 20200608132959) do
     t.boolean "read", default: false
     t.integer "discussion_id"
     t.boolean "approved", default: false
+    t.boolean "not_actually_a_question", default: false
   end
 
   create_table "organizations", id: :serial, force: :cascade do |t|
@@ -375,6 +385,7 @@ ActiveRecord::Schema.define(version: 20200608132959) do
     t.string "verified_last_name"
     t.bigint "avatar_id"
     t.datetime "disabled_at"
+    t.boolean "trusted_for_forum"
     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

data/spec/features/discussion_flow_spec.rb

@@ -0,0 +1,190 @@
+require 'spec_helper'
+
+feature 'Discussion Flow', organization_workspace: :test do
+
+  ## =============
+  ## Users
+  ## =============
+
+  let(:student) { create(:user, permissions: {student: 'test/*:other/*:empty/*'}) }
+  let(:another_student) { create(:user, permissions: {student: 'test/*:other/*:empty/*'}) }
+  let(:moderator) { create(:user, permissions: {moderator: 'test/*:other/*:empty/*', student: 'test/*:other/*:empty/*'}) }
+
+  ## =================
+  ## Organizations
+  ## =================
+
+  let(:test_organization) { Organization.locate! 'test' }
+  let(:other_organization) { create(:organization, name: 'other') }
+  let!(:empty_organization) { create(:organization, name: 'empty') }
+
+  ## ================================
+  ## Content for test_organization
+  ## ================================
+
+  let(:problem_1) { create(:problem) }
+  let(:problem_2) { create(:problem) }
+  let(:problem_3) { create(:problem) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [create(:lesson, exercises: [ problem_1, problem_2, problem_3])])
+  }
+
+  ## =====================================
+  ## Discussions for test_organization
+  ## =====================================
+
+  let(:problem_2_discussions) { create_list(:discussion, 5, initiator: another_student, item: problem_2, organization: test_organization) }
+  let(:problem_3_discussions) { create_list(:discussion, 5, initiator: student, item: problem_2, organization: test_organization) }
+  let!(:test_organization_discussions) { problem_2_discussions + problem_3_discussions }
+
+  ## ===================================
+  ## Content for other_organization
+  ## ===================================
+
+  let(:other_problem) { create(:problem) }
+  let!(:other_chapter) {
+    create(:chapter, book: other_organization.book, lessons: [create(:lesson, exercises: [other_problem])])
+  }
+
+  ## =====================================
+  ## Discussions for other_organization
+  ## =====================================
+
+  let(:other_problem_discussions) { create_list(:discussion, 5, initiator: student, item: problem_2, organization: other_organization) }
+  let!(:other_organization_discussions) { other_problem_discussions }
+
+  before { reindex_current_organization! }
+  before { reindex_organization! other_organization }
+  before { reindex_organization! empty_organization }
+
+  shared_examples 'no forum access' do
+    scenario 'has no forum access' do
+      visit current_path
+      expect(page).to have_text('You may have mistyped the address or the page may have moved')
+    end
+  end
+
+  context 'exercise discussions' do
+    let(:current_path) { "/exercises/#{problem_1.id}/discussions" }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged user' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        scenario 'empty discussion list for problem 1' do
+          visit "/exercises/#{problem_1.id}/discussions"
+          expect(page).to have_text(problem_1.name)
+          expect(page).to have_text('It seems there isn\'t any question yet.')
+        end
+
+        scenario 'discussion list for problem 2' do
+          visit "/exercises/#{problem_2.id}/discussions"
+          expect(page).to have_text(problem_2.name)
+          problem_2_discussions.each do |discussion|
+            expect(page).to have_text(discussion.description)
+          end
+          expect(page).to have_text('Didn\'t find what you were looking for?')
+        end
+      end
+    end
+  end
+
+  context 'book discussions' do
+    let(:current_path) { '/discussions' }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged user' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        context 'in empty organization' do
+          before { empty_organization.update! forum_enabled: true }
+          before { set_subdomain_host! 'empty' }
+          after { set_subdomain_host! 'test' }
+
+          scenario 'empty discussion list for book without discussions' do
+            visit current_path
+            expect(page).to have_text(empty_organization.book.name)
+            expect(page).to have_text('It seems there isn\'t any question yet.')
+          end
+
+        end
+
+        scenario 'discussion list for book with discussions' do
+          visit current_path
+          expect(page).to have_text(test_organization.book.name)
+          test_organization_discussions.each do |discussion|
+            expect(page).to have_text(discussion.description)
+          end
+          other_organization_discussions.each do |discussion|
+            expect(page).not_to have_text(discussion.description)
+          end
+          expect(page).not_to have_text('Didn\'t find what you were looking for?')
+          expect(page).not_to have_text('It seems there isn\'t any question yet.')
+        end
+      end
+    end
+  end
+
+  context 'exercise discussion' do
+    let(:current_path) { "/exercises/#{problem_2.id}/discussions/#{problem_2_discussions.first.id}" }
+    before { test_organization.switch! }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged student' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        scenario 'newly created discussion' do
+          visit current_path
+          expect(page).to have_text(problem_2.name)
+          expect(page).to have_text('Open')
+          expect(page).to have_text('Messages')
+          expect(page).not_to have_xpath("//div[@class='discussion-actions']")
+        end
+
+        context 'for moderator' do
+          before { set_current_user! moderator }
+
+          scenario 'newly created discussion' do
+            visit current_path
+            expect(page).to have_text(problem_2.name)
+            expect(page).to have_text('Open')
+            expect(page).to have_text('Messages')
+            expect(page).to have_xpath("//div[@class='discussion-actions']")
+          end
+        end
+      end
+    end
+  end
+
+end