mumuki-laboratory 9.0.6 → 9.2.0

data/app/views/users/terms.html.erb

@@ -20,10 +20,12 @@
   <div class="terms-acceptance">
     <%= form_for :user, url: terms_user_path, method: :post  do |f| %>
       <span class="terms-acceptance-checkbox">
-        <%= f.check_box :terms_of_service, required: true, onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')", onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
+        <%= f.check_box :terms_of_service, required: true, class: 'form-check-input',
+                        onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')",
+                        onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
         <%= t(:accept_terms) %>
       </span>
-      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+      <%= f.submit t(:accept), class: 'btn btn-complementary terms-acceptance-btn' %>
     <% end %>
   </div>
 <% end %>

data/config/routes.rb

@@ -24,7 +24,7 @@ Rails.application.routes.draw do
     get '/discussions/messages/preview', to: 'discussions_messages#preview', as: :preview_discussion_message
 
     resources :exam_registrations, only: [:show]
-    resources :exam_authorization_requests, only: [:show, :create, :update]
+    resources :exam_authorization_requests, only: [:create, :update]
 
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
@@ -68,6 +68,7 @@ Rails.application.routes.draw do
       get :discussions
       get :activity
       get :certificates
+      get :exam_authorizations
 
     end
 

data/lib/mumuki/laboratory.rb

@@ -14,7 +14,7 @@ require 'mumukit/nuntius'
 require 'mumukit/platform'
 
 require 'kaminari'
-require 'bootstrap-kaminari-views'
+require 'bootstrap5-kaminari-views'
 
 Mumukit::Nuntius.configure do |config|
   config.app_name = 'laboratory'

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

@@ -66,6 +66,18 @@ en:
   create_submission: Submit
   created_at: Created at
   date: Date
+  deleted_by: Deleted by %{deleter}
+  deleted_message_warning: If you repeateadly violate these or other rules, you may be prohibited from accessing the forum or you may suffer more severe consequences, such as being expulsed from the course.
+  deletion_motive:
+    inappropriate_content:
+      present: Includes inappropriate content
+      past: Included inappropriate content
+    shares_solution:
+      present: Shares the correct solution
+      past: Shared the correct solution
+    discloses_personal_information:
+      present: Discloses personal information
+      past: Disclosed personal information
   description: Description
   destroy: Destroy
   destroy_message: delete the message
@@ -96,9 +108,10 @@ en:
   error_500: 500 error
   error_description: This is known as a <span class="error-link">%{error}</span>.
   errored: Oops, your solution didn't work
+  exam_authorization_pending_explanation_html: You have until <strong>%{end_time}</strong> to register. After that date, your request will be processed and you will receive a confirmation. <br> Don't forget to check the notifications!
   exam_authorization_request_approved_html: Your request was approved, don't forget to log in at <strong>%{date}</strong>. Good luck!
   exam_authorization_request_created: Your registration to the exam has been saved!
-  exam_authorization_request_rejected: Your request was rejected.
+  exam_authorization_request_rejected: Your request was rejected because you didn't meet the requirements.
   exam_authorization_request_saved: Your registration to the exam has been updated!
   exam_authorization_request_updated: Your registration to %{description} has been updated
   exam_registration_choose_exam: Choose date and time to attend to the exam
@@ -176,6 +189,7 @@ en:
     one: 1 message
     other: '%{count} messages'
   message: Message
+  message_deleted: This message was deleted because it %{motive}, which violates the %{forum_terms}.
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
   moderation: Mentoring
@@ -254,6 +268,7 @@ en:
   select_file: Select file
   sending_solution: Sending solution
   show: Show
+  show_message: Show message
   sign_in: Sign in
   sign_in_action: sign in
   sign_out: Sign Out
@@ -319,7 +334,7 @@ en:
   user_data_updated: Your data was updated successfully
   username: Username
   view_details: View details
-  want_permissions: The next user requires permissions
+  want_permissions: The following user requires permissions for the organization
   we_miss_you: We miss you!
   week_of: Week of %{date}
   welcome: Welcome to %{name}!

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

@@ -65,6 +65,18 @@ es-CL:
   created_exercises: Ejercicios Creados
   created_guides: Lecciones Creadas
   date: Fecha
+  deleted_by: Eliminado por %{deleter}
+  deleted_message_warning: Si infringes reiteradamente estas u otras reglas del Espacio de Consultas, se te puede prohibir el acceso al mismo o podrás sufrir consecuencias más severas, como la expulsión del curso.
+  deletion_motive:
+    inappropriate_content:
+      present: Incluye contenido inapropiado
+      past: Incluía contenido inapropiado
+    shares_solution:
+      present: Comparte la solución correcta
+      past: Compartía la solución correcta
+    discloses_personal_information:
+      present: Divulga información personal
+      past: Divulgaba información personal
   day: Día
   days: Días
   description: Descripción
@@ -96,9 +108,10 @@ es-CL:
       internal_server_error: ¡Ups! Algo no anduvo bien
       not_found: ¡Ups!  La página no existe
   errored: ¡Ups! Tu solución no se puede ejecutar
+  exam_authorization_pending_explanation_html: Tienes tiempo hasta el <strong>%{end_time}</strong> para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
   exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong>. ¡Buena suerte!
   exam_authorization_request_created: ¡Tu inscripción al exámen se registró exitosamente!
-  exam_authorization_request_rejected: Tu solicitud fue rechazada.
+  exam_authorization_request_rejected: Tu solicitud fue rechazada porque no cumpliste con los requisitos para rendir el examen.
   exam_authorization_request_saved: ¡Tu inscripción al exámen se modificó exitosamente!
   exam_authorization_request_updated: Hay novedades sobre tu inscripción a %{description}
   exam_registration_choose_exam: Seleccioná día y horario en el que te gustaría rendir el exámen
@@ -176,6 +189,7 @@ es-CL:
     one: 1 mensaje
     other: '%{count} mensajes'
   message: Mensaje
+  message_deleted: Este mensaje fue eliminado porque %{motive}, lo cual infringe las %{forum_terms}.
   messages: Mensajes
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Vuelve a intentar más tarde!
   messages_pluralized:
@@ -259,6 +273,7 @@ es-CL:
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
+  show_message: Mostrar mensaje
   sign_in: Inicia sesión
   sign_in_action: iniciar sesión
   sign_out: Cerrar Sesión
@@ -330,7 +345,7 @@ es-CL:
   user: Usuario
   username: Nombre de usuario
   view_details: Ver detalles
-  want_permissions: El siguiente usuario requiere permisos
+  want_permissions: El siguiente usuario requiere permisos para la organización
   we_miss_you: ¡Te extrañamos!
   week_of: Semana del %{date}
   will_paginate:

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

@@ -71,6 +71,18 @@ es:
   created_exercises: Ejercicios Creados
   created_guides: Lecciones Creadas
   date: Fecha
+  deleted_by: Eliminado por %{deleter}
+  deleted_message_warning: Si infringís reiteradamente estas u otras reglas del Espacio de Consultas, se te puede prohibir el acceso al mismo o podrás sufrir consecuencias más severas, como la expulsión del curso.
+  deletion_motive:
+    inappropriate_content:
+      present: Incluye contenido inapropiado
+      past: Incluía contenido inapropiado
+    shares_solution:
+      present: Comparte la solución correcta
+      past: Compartía la solución correcta
+    discloses_personal_information:
+      present: Divulga información personal
+      past: Divulgaba información personal
   day: Día
   days: Días
   description: Descripción
@@ -104,9 +116,10 @@ es:
       internal_server_error: ¡Ups! Algo no anduvo bien
       not_found: ¡Ups!  La página no existe
   errored: ¡Ups! Tu solución no se puede ejecutar
+  exam_authorization_pending_explanation_html: Tenés tiempo hasta el <strong>%{end_time}</strong> para cambiar el turno haciendo click <strong><a href="%{edit_path}">acá</a></strong>. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
   exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong>. ¡Buena suerte!
   exam_authorization_request_created: ¡Tu inscripción al exámen se registró exitosamente!
-  exam_authorization_request_rejected: Tu solicitud fue rechazada.
+  exam_authorization_request_rejected: Tu solicitud fue rechazada porque no cumpliste con los requisitos para rendir el examen.
   exam_authorization_request_saved: ¡Tu inscripción al exámen se modificó exitosamente!
   exam_authorization_request_updated: Hay novedades sobre tu inscripción a %{description}
   exam_registration_choose_exam: Seleccioná día y horario en el que te gustaría rendir el exámen
@@ -187,6 +200,7 @@ es:
     one: 1 mensaje
     other: '%{count} mensajes'
   message: Mensaje
+  message_deleted: Este mensaje fue eliminado porque %{motive}, lo cual infringe las %{forum_terms}.
   messages: Mensajes
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Volvé a intentar mas tarde!
   messages_pluralized:
@@ -274,6 +288,7 @@ es:
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
+  show_message: Mostrar mensaje
   sign_in: Iniciá sesión
   sign_in_action: iniciar sesión
   sign_out: Cerrar Sesión
@@ -346,7 +361,7 @@ es:
   user: Usuario
   username: Nombre de usuario
   view_details: Ver detalles
-  want_permissions: El siguiente usuario requiere permisos
+  want_permissions: El siguiente usuario requiere permisos para la organización
   we_miss_you: ¡Te extrañamos!
   welcome: ¡Te damos la bienvenida a %{name}!
   week_of: Semana del %{date}

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>
@@ -68,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
@@ -100,9 +111,10 @@ pt:
   error_500: erro 500
   error_description: Isto é o que é conhecido como <span class = "error-link"> %{error} </ span>.
   errored: Opa! Sua solução não pode ser executada
+  exam_authorization_pending_explanation_html: Você tem tempo até <strong>%{date}</strong> para se inscrever. Após essa data, sua inscrição será avaliada e você receberá uma confirmação. <br> Não se esqueça de verificar as notificações!
   exam_authorization_request_approved_html: Sua solicitação foi aprovada, não se esqueça de conectar em <strong>%{date}</strong>. Boa sorte!
   exam_authorization_request_created: Seu registro de exame foi salvo com sucesso!
-  exam_authorization_request_rejected: Seu pedido foi rejeitado.
+  exam_authorization_request_rejected: Sua solicitação foi rejeitada porque você não atendeu aos requisitos.
   exam_authorization_request_saved: Seu registro de exame foi modificado com sucesso!
   exam_authorization_request_updated: Há notícias sobre seu registro para %{description}
   exam_registration_choose_exam: Selecione o dia e a hora em que gostaria de fazer o exame
@@ -181,6 +193,7 @@ 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!
@@ -264,6 +277,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
@@ -329,7 +343,7 @@ 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

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.0.6'
+    VERSION = '9.2.0'
   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

@@ -31,6 +31,68 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
     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, type: :controller, organization_workspac
       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,7 +124,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
       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} }
 

data/spec/controllers/exam_authorization_requests_controller_spec.rb

@@ -7,23 +7,6 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
 
   before { set_current_user! user }
 
-  describe 'show' do
-    context 'when authorization does not exist' do
-      before { get :show, params: {id: 0} }
-      it { expect(response.status).to eq 404 }
-    end
-
-    context 'when authorization exists' do
-      let(:exam_authorization_request) { create(:exam_authorization_request, user: user, exam_registration: exam_registration) }
-      let!(:notification) { create(:notification, target: exam_authorization_request, user: user) }
-
-      before { get :show, params: {id: exam_authorization_request.id} }
-
-      it { expect(response.status).to eq 200 }
-      it { expect(notification.reload.read).to be_truthy }
-    end
-  end
-
   describe 'create' do
     let!(:notification) { create(:notification, target: exam_registration, user: user) }
 
@@ -33,7 +16,7 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
       }
     end
 
-    it { expect(response.status).to eq 204 }
+    it { expect(response.status).to eq 302 }
     it { expect(exam_registration.authorization_requests.length).to be 1 }
     it { expect(notification.reload.read).to be_truthy }
   end

data/spec/controllers/users_controller_spec.rb

@@ -18,4 +18,5 @@ describe UsersController, type: :controller, organization_workspace: :test do
     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

@@ -381,7 +381,11 @@ ActiveRecord::Schema.define(version: 20210330175706) do
     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|

data/spec/features/discussion_flow_spec.rb

@@ -162,7 +162,12 @@ 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
@@ -170,7 +175,14 @@ feature 'Discussion Flow', organization_workspace: :test do
           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
@@ -182,11 +194,17 @@ feature 'Discussion Flow', organization_workspace: :test do
             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