mumuki-laboratory 9.0.3 → 9.1.1

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

@@ -1,4 +1,3 @@
----
 pt:
   aborted: Opa, não pudemos avaliar sua solução
   abort_explanation_html: <li>Verifique se o seu programa não possui recursão ou um loop infinito</li> <li>Verifique se você tem uma conexão com a internet</li> <li>Espere um pouco e tente novamente</li>
@@ -16,6 +15,9 @@ pt:
   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}?'
+  approved_messages:
+    one: validado
+    other: validados
   ask_a_question: Faça uma pergunta!
   ask_community: Pergunte à comunidade
   ask_redirect: Você quer que nós o levemos para lá?
@@ -65,6 +67,18 @@ pt:
   created_exercises: Exercícios criados
   created_guides: Lições criadas
   date: Data
+  deleted_by: Removido pelo
+  deleted_message_warning: Se você violar repetidamente essas ou outras regras da Área de Consulta, seu acesso a ela pode ser proibido ou você pode sofrer consequências mais graves, como a expulsão do curso.
+  deletion_motive:
+    inappropriate_content:
+      present: Inclui conteúdo impróprio
+      past: Incluiu conteúdo impróprio
+    shares_solution:
+      present: Compartilhe a solução correta
+      past: Compartilhou a solução correta
+    discloses_personal_information:
+      present: Divulga informações pessoais
+      past: Divulgar informações pessoais
   day: Dia
   days: Dias
   description: Descrição
@@ -80,6 +94,7 @@ pt:
   discussions_will_be_here: As perguntas que você fizer no espaço de consulta aparecerão aqui.
   download: Faça o download do que você fez
   edit: Editar
+  edit_message: Editar mensagem
   edit_profile: Editar perfil
   editor_placeholder: ... Escreva sua solução aqui ...
   email: E-mail
@@ -177,8 +192,13 @@ pt:
     one: 1 mensagem
     other: '%{count} mensagens'
   message: Mensagem
+  message_deleted: Esta mensagem foi excluída porque %{motive}, o que viola as %{forum_terms}.
   messages: Mensagens
   messages_error: As mensagens acima não estão disponíveis no momento. Eu tentei novamente mais tarde!
+    mais tarde!
+  messages_pluralized:
+    one: Mensagem
+    other: Mensagens
   minute: minuto
   minutes: minutos
   moderation: Mentoria
@@ -232,6 +252,8 @@ pt:
   permissions: Permissões
   please_fill_profile_data: Preencha suas informações pessoais para continuar!
   please_validate: Você está prestes a entrar no curso. Para oferecer uma experiência melhor, valide que seus dados abaixo sejam reais e corretos.
+  preview: Vista prévia
+  preview_error: A visualizaçao não pode ser mostrada. Verifique sua conexão com a internet ou tente com uma mensagem mais curta.
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Erro com exercício %{title}'
   processing_your_solution: Estamos processando sua solução
@@ -254,6 +276,7 @@ pt:
   send: Enviar
   sending_solution: Solução de envio
   show: Mostrar
+  show_message: Mostrar mensagem
   sign_in: Iniciar sessão
   sign_in_action: iniciar sessão
   sign_out: Fechar Sessão
@@ -264,12 +287,18 @@ pt:
   skipped_solve_anyway: Resolver mesmo assim
   solution: Solução
   solved: Resolvido
-  solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
+  solved_count:
+    one: 1 resolvido
+    other: '%{count} resolvidos'
   solve_doubts: Resolvi dúvidas
   solve_more_exercises_to_level_up: Resolva mais <span>number</span> exercícios para avançar para o próximo nível.
   solve_your_doubts: Consulte suas dúvidas
   solve_your_doubts_teaser: Você tem alguma dúvida?
+  solved_exercises_count:
+    one: resolvido
+    other: resolvidos
+  solved_exercises_percentage: realizado
   something_went_wrong: Oops!, Algo não estava certo ...
   sort: Ordenar
   sources: Bibliografia
@@ -301,6 +330,7 @@ pt:
   to_pending_review: Marcar como resolvida
   to_solved: Marcar como resolvida
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
+  total: Total
   uncategorized: Não classificado
   unlocked_medal_as_avatar: Você ganhou essa medalha! Agora você pode escolhê-la como avatar.
   unspecified: Eu preferiria não dizer
@@ -312,7 +342,8 @@ pt:
   user_data_updated: Os seus dados foram atualizados corretamente
   username: Nome de usuário
   view_details: Ver detalhes
-  want_permissions: O próximo usuário requer permissões
+  want_permissions: O próximo usuário requer permissões para a organização
+  week_of: Semana de %{date}
   welcome: Convidamos você a {name}!
   working: Processamento
   wrong_answer: A resposta não é correta

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.0.3'
+    VERSION = '9.1.1'
   end
 end

data/spec/capybara_helper.rb

@@ -83,6 +83,7 @@ def exclude_selenium_failing_tests!
 
       # TODO: the following ignored groups should be fixed
       :element_not_interactable_error,
+      :toast_interferes_with_view,
       :invalid_selector_error,
       :json_eq_error,
       :navigation_error,

data/spec/controllers/discussions_messages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DiscussionsMessagesController, organization_workspace: :test do
+describe DiscussionsMessagesController, type: :controller, organization_workspace: :test do
   let(:student) { create(:user, permissions: {student: 'test/*'}) }
   let(:moderator) { create(:user, permissions: {moderator: 'test/*', student: 'test/*'}) }
 
@@ -31,6 +31,68 @@ describe DiscussionsMessagesController, organization_workspace: :test do
     end
   end
 
+  describe 'delete' do
+    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+
+    describe 'for student' do
+      before { set_current_user! student }
+
+      describe 'own message with permitted motive' do
+        before do
+          delete :destroy, params: {id: message.id, discussion_id: discussion.id, motive: :self_deleted}
+          message.reload
+        end
+
+        it { expect(response.status).to eq 302 }
+        it { expect(message.deleted?).to be true }
+        it { expect(message.deleted_by).to eq student }
+        it { expect(message.deleted_at).to_not eq nil }
+        it { expect(message.deletion_motive).to eq 'self_deleted' }
+      end
+
+      describe 'own message with forbidden motive' do
+        before do
+          delete :destroy, params: {id: message.id, discussion_id: discussion.id, motive: :shares_solution}
+          message.reload
+        end
+
+        it { expect(response.status).to eq 403 }
+        it { expect(message.deleted?).to be false }
+        it { expect(message.deleted_by).to eq nil }
+        it { expect(message.deleted_at).to eq nil }
+        it { expect(message.deletion_motive).to eq nil }
+      end
+
+      describe 'someone else\'s message' do
+        let(:message) { create(:message, discussion: discussion, sender: moderator.uid) }
+        before do
+          delete :destroy, params: {id: message.id, discussion_id: discussion.id, motive: :self_deleted}
+          message.reload
+        end
+
+        it { expect(response.status).to eq 403 }
+        it { expect(message.deleted?).to be false }
+        it { expect(message.deleted_by).to eq nil }
+        it { expect(message.deleted_at).to eq nil }
+        it { expect(message.deletion_motive).to eq nil }
+      end
+    end
+
+    describe 'for moderator' do
+      before do
+        set_current_user! moderator
+        delete :destroy, params: {id: message.id, discussion_id: discussion.id, motive: :inappropriate_content}
+        message.reload
+      end
+
+      it { expect(response.status).to eq 302 }
+      it { expect(message.deleted?).to be true }
+      it { expect(message.deleted_by).to eq moderator }
+      it { expect(message.deleted_at).to_not eq nil }
+      it { expect(message.deletion_motive).to eq 'inappropriate_content' }
+    end
+  end
+
   describe 'approve' do
     let(:message) { create(:message, discussion: discussion, sender: student.uid) }
 
@@ -42,7 +104,7 @@ describe DiscussionsMessagesController, organization_workspace: :test do
       it { expect(message.reload.approved).to be false }
     end
 
-    describe 'for student' do
+    describe 'for moderator' do
       before { set_current_user! moderator }
       before { post :approve, params: {id: message.id, discussion_id: discussion.id} }
 
@@ -62,12 +124,31 @@ describe DiscussionsMessagesController, organization_workspace: :test do
       it { expect(message.reload.not_actually_a_question).to be false }
     end
 
-    describe 'for student' do
+    describe 'for moderator' 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
+
+    describe 'preview' do
+      let(:message) { create(:message, content: 'Message in **bold** and _italics_', discussion: discussion, sender: student.uid) }
+
+      describe 'for student' do
+        before { set_current_user! student }
+        before { get :preview, params: {content: message.content} }
+
+        it { expect(response.status).to eq 403 }
+      end
+
+      describe 'for moderator' do
+        before { set_current_user! moderator }
+        before { get :preview, params: {content: message.content} }
+
+        it { expect(response.status).to eq 200 }
+        it { expect(JSON.parse(response.body)['preview']).to eq "<p>Message in <strong>bold</strong> and <em>italics</em></p>\n" }
+      end
+    end
   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: 20210302181654) do
+ActiveRecord::Schema.define(version: 20210330175706) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -79,14 +79,16 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.bigint "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.index ["organization_id"], name: "index_certificate_programs_on_organization_id"
   end
 
   create_table "certificates", force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "certificate_program_id"
-    t.datetime "start_date"
-    t.datetime "end_date"
+    t.datetime "started_at"
+    t.datetime "ended_at"
     t.string "code"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -121,6 +123,8 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.integer "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "period_start"
+    t.datetime "period_end"
   end
 
   create_table "discussions", force: :cascade do |t|
@@ -199,6 +203,13 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.index ["exam_registration_id"], name: "index_exam_registrations_exams_on_exam_registration_id"
   end
 
+  create_table "exam_registrations_users", id: false, force: :cascade do |t|
+    t.bigint "exam_registration_id", null: false
+    t.bigint "user_id", null: false
+    t.index ["exam_registration_id"], name: "index_exam_registrations_users_on_exam_registration_id"
+    t.index ["user_id"], name: "index_exam_registrations_users_on_user_id"
+  end
+
   create_table "exams", id: :serial, force: :cascade do |t|
     t.integer "organization_id"
     t.integer "guide_id"
@@ -368,6 +379,13 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.integer "discussion_id"
     t.boolean "approved", default: false
     t.boolean "not_actually_a_question", default: false
+    t.datetime "approved_at"
+    t.bigint "approved_by_id"
+    t.integer "deletion_motive"
+    t.datetime "deleted_at"
+    t.bigint "deleted_by_id"
+    t.index ["approved_by_id"], name: "index_messages_on_approved_by_id"
+    t.index ["deleted_by_id"], name: "index_messages_on_deleted_by_id"
   end
 
   create_table "notifications", force: :cascade do |t|
@@ -507,6 +525,8 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.datetime "forum_terms_accepted_at"
     t.boolean "banned_from_forum"
     t.boolean "uppercase_mode"
+    t.string "delete_account_token"
+    t.datetime "delete_account_token_expiration_date"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

data/spec/features/discussion_flow_spec.rb

@@ -162,14 +162,27 @@ feature 'Discussion Flow', organization_workspace: :test do
       end
 
       context 'and forum enabled' do
-        before { Organization.current.update! forum_enabled: true }
+        let!(:problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student.uid) }
+        let!(:another_problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student.uid) }
+        before do
+          Organization.current.update! forum_enabled: true
+          another_problem_2_discussion_message.soft_delete! :inappropriate_content, moderator
+        end
 
         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_text('Preview')
+          expect(page).to have_text(problem_2_discussion_message.content)
+          expect(page).not_to have_text(another_problem_2_discussion_message.content)
           expect(page).not_to have_xpath("//div[@class='discussion-actions']")
+          expect(page).to_not have_text('Includes inappropriate content')
+          expect(page).to_not have_text('Shares the correct solution')
+          expect(page).to_not have_text('Discloses personal information')
+          expect(page).to have_text('included inappropriate content')
+          expect(page).to_not have_text ("Deleted by #{moderator.name}")
         end
 
         context 'for moderator' do
@@ -180,11 +193,18 @@ feature 'Discussion Flow', organization_workspace: :test do
             expect(page).to have_text(problem_2.name)
             expect(page).to have_text('Open')
             expect(page).to have_text('Messages')
+            expect(page).to have_text('Preview')
+            expect(page).to have_text(problem_2_discussion_message.content)
+            expect(page).to have_text(another_problem_2_discussion_message.content)
             expect(page).to have_xpath("//div[@class='discussion-actions']")
+            expect(page).to have_text('Includes inappropriate content')
+            expect(page).to have_text('Shares the correct solution')
+            expect(page).to have_text('Discloses personal information')
+            expect(page).to have_text('included inappropriate content')
+            expect(page).to have_text ("Deleted by #{moderator.name}")
           end
         end
       end
     end
   end
-
 end

data/spec/features/exercise_flow_spec.rb

@@ -190,7 +190,7 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('need a hint?')
       expect(page).to have_selector('.upload')
       expect(problem_5.language.extension).to eq('gbs')
-      expect(page.find("//div[@class = 'form-group']/input")['accept']).to eq(".gbs")
+      expect(page.find("//input[@id = 'mu-upload-input']")['accept']).to eq(".gbs")
 
       expect(page.find("#mu-exercise-id")['value']).to eq(problem_5.id.to_s)
       expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')

data/spec/features/guide_reset_spec.rb

@@ -18,7 +18,7 @@ feature 'Guide Reset Flow', organization_workspace: :test do
 
   before { reindex_current_organization! }
 
-  let(:restart_xpath) { "//i[@title='#{I18n.t(:restart)}']" }
+  let(:restart_xpath) { "//a[@title='#{I18n.t(:restart)}']" }
 
   context 'no logged in user' do
     scenario 'visit guide' do

data/spec/features/terms_flow_spec.rb

@@ -92,8 +92,7 @@ feature 'Terms Flow', organization_workspace: :test do
       end
     end
 
-    context 'with unaccepted role terms' do
-
+    context 'with unaccepted role terms', :toast_interferes_with_view do
       context 'visit forum' do
         let(:terms_path) { '/discussions/terms' }
         before { test_organization.update! forum_enabled: true }

data/spec/features/user_activity_flow_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+feature 'User Activity Flow', organization_workspace: :test do
+  let(:user) { create(:user) }
+  before { set_current_user!(user) }
+
+  let(:fake_stats) { double('stats') }
+  before do
+    allow(UserStats).to receive(:stats_for).and_return(fake_stats)
+    allow(fake_stats).to receive(:activity).and_return(
+        { exercises: { solved_count: 8, count: 10 },
+          messages: { count: 12, approved: 6 } })
+  end
+
+  let(:week_start) { Time.new(2020, 10, 12) }
+  before do
+    allow(Time).to receive(:now).and_return(week_start)
+  end
+
+  context 'total' do
+    before { visit activity_user_path }
+
+    scenario 'displays exercises done percentage' do
+      expect(page).to have_text('80%')
+      expect(page).to have_text('done')
+    end
+
+    scenario 'displays exercises solved count' do
+      expect(page).to have_text('8')
+      expect(page).to have_text('solved')
+    end
+
+    scenario 'displays messages count' do
+      expect(page).to have_text('12')
+      expect(page).to have_text('messages')
+    end
+
+    scenario 'displays validated messages count' do
+      expect(page).to have_text('6')
+      expect(page).to have_text('validated')
+    end
+
+    scenario 'displays recent weeks' do
+      expect(page).to have_text 'Week of 2020-10-12'
+      expect(page).to have_text 'Week of 2020-10-05'
+      expect(page).to have_text 'Week of 2020-09-28'
+    end
+  end
+
+  context 'selecting a specific week' do
+    before do
+      visit activity_user_path
+      click_on 'Week of 2020-10-12'
+    end
+
+    scenario "redirects to week activity" do
+      expect(page).to have_current_path('/user/activity?date_from=2020-10-12&date_to=2020-10-19')
+    end
+
+    scenario "doesn't display exercises done percentage" do
+      expect(page).not_to have_text('80%')
+      expect(page).not_to have_text('done')
+    end
+  end
+end