mumuki-laboratory 7.7.1 → 7.7.6

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
@@ -146,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

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
@@ -142,7 +143,7 @@ pt:
   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
@@ -164,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!

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.7.1'
+    VERSION = '7.7.6'
   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/dummy/db/schema.rb

@@ -385,6 +385,7 @@ ActiveRecord::Schema.define(version: 20200731081757) 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

data/spec/features/menu_bar_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 feature 'menu bar' do
-  let(:chapter) { create(:chapter, lessons: [create(:lesson)]) }
+  let(:lesson) { create(:lesson, exercises: create_list(:exercise, 3))}
+  let(:chapter) { create(:chapter, lessons: [lesson]) }
   let(:book) { create(:book, chapters: [chapter], name: 'private', slug: 'mumuki/mumuki-the-private-book') }
   let(:private_organization) { create(:organization, name: 'private', book: book) }
 
@@ -32,6 +33,8 @@ feature 'menu bar' do
         expect(page).not_to have_text('Profile')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
+        expect(page).not_to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
       end
     end
   end
@@ -52,15 +55,91 @@ feature 'menu bar' do
       expect(page).to have_text('Profile')
       expect(page).not_to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
+      expect(page).not_to have_text('Solve other\'s doubts')
+      expect(page).not_to have_text('My doubts')
     end
 
-    scenario 'student should only see profile' do
-      set_current_user! visitor
+    context 'student with no discussions should' do
+      scenario 'only see profile if forum is not enabled' do
+        set_current_user! student
 
-      visit '/'
-      expect(page).to have_text('Profile')
-      expect(page).not_to have_text('Classroom')
-      expect(page).not_to have_text('Bibliotheca')
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).not_to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
+      end
+
+      scenario 'see profile and solve_other_doubts links if forum is enabled' do
+        set_current_user! student
+        private_organization.update! forum_enabled: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
+      end
+    end
+
+    context 'student with discussions should' do
+      let(:discussion) { create(:discussion, item: lesson.exercises.last, initiator: student)}
+
+      scenario 'only see profile if forum is not enabled' do
+        set_current_user! student
+        student.subscribe_to! discussion
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).not_to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
+      end
+
+      scenario 'see all discussions links if forum is enabled' do
+        set_current_user! student
+        private_organization.update! forum_enabled: true
+        student.subscribe_to! discussion
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).to have_text('My doubts')
+      end
+
+      scenario 'only see profile if forum is enabled in a forum_only_for_trusted organization' do
+        set_current_user! student
+        student.subscribe_to! discussion
+        private_organization.update! forum_enabled: true
+        private_organization.update! forum_only_for_trusted: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).not_to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
+      end
+
+      scenario 'see all discussions links if forum is enabled in a forum_only_for_trusted organization but it is trusted' do
+        student.update! trusted_for_forum: true
+        set_current_user! student
+        student.subscribe_to! discussion
+        private_organization.update! forum_enabled: true
+        private_organization.update! forum_only_for_trusted: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).to have_text('My doubts')
+      end
     end
 
     scenario 'teacher should see profile and classroom' do
@@ -71,6 +150,8 @@ feature 'menu bar' do
       expect(page).to have_text('Profile')
       expect(page).to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
+      expect(page).not_to have_text('Solve other\'s doubts')
+      expect(page).not_to have_text('My doubts')
     end
 
     scenario 'writer should see profile and bibliotheca' do

data/spec/javascripts/bridge-spec.js

@@ -0,0 +1,5 @@
+describe('bridge', () => {
+  it('can create bridge', () => {
+    expect(new mumuki.bridge.Laboratory()).not.toBe(null);
+  })
+})