mumuki-laboratory 9.20.0 → 9.23.0

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

@@ -0,0 +1,35 @@
+<div class="modal fade" id="user-delete-account-modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg d-table">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h3 class="modal-title"><%= t :delete_account %></h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <p><%= t :delete_account_modal_explain_html, user_email: @user.email %></p>
+          </div>
+          <% if @user.student_granted_organizations.present? %>
+            <div class="row">
+              <p><%= t :delete_account_modal_lost_permissions %></p>
+            </div>
+            <div class="row">
+              <% @user.student_granted_organizations.each do |organization| %>
+                <div class="col-md-4 text-center">
+                  <%= image_tag(organization.banner_url, width: '100%', class: 'pull-left') %>
+                  <p><%= organization.name %></p>
+                </div>
+              <% end %>
+            </div>
+          <% end %>
+          <div class="row">
+            <%= form_with class: 'mu-form', url: delete_request_user_path do |f| %>
+              <%= f.submit t(:delete_account_agree), class: 'btn btn-danger w-100', id: 'delete-account-button' %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,27 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
+
+  <div class="col-md-9 mu-tab-body">
+    <h3 class="text-danger"><%= t :delete_account %></h3>
+    <div class="row">
+      <div class="col-md-8">
+        <p><%= t :delete_account_explain %></p>
+      </div>
+      <div class="col-md-4">
+        <div class="pull-right">
+          <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#user-delete-account-modal">
+            <%= t :delete_account %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= content_for :no_container do %>
+  <%= render partial: 'user_delete_modal' %>
+<% end %>

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

@@ -0,0 +1,22 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @user %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :delete_account %>
+    </h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <p>
+      <%= t :delete_account_invalid_token %>
+    </p>
+    <p>
+      <%= t :delete_account_try_again_html, profile_url: user_path %>
+    </p>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<%= render partial: 'user_delete_confirmation' %>

data/config/routes.rb

@@ -63,9 +63,6 @@ Rails.application.routes.draw do
       get :terms
       post :terms, to: 'users#accept_profile_terms'
 
-      # Notification subscriptions
-      get :unsubscribe
-
       get :messages
       get :discussions
       get :activity
@@ -76,6 +73,12 @@ Rails.application.routes.draw do
       post 'notifications/:id/toggle_read', action: :toggle_read
       get 'notifications/manage', action: :show_manage_notifications
       post 'notifications/manage', action: :manage_notifications
+
+      get :delete_account
+      get :delete_request
+      post :delete_request, to: 'users#send_delete_confirmation_email'
+      get :delete_confirmation_invalid
+      get :delete_confirmation
     end
 
     resources :faqs, only: [:index]

data/lib/mumuki/laboratory/controllers/dynamic_errors.rb

@@ -41,27 +41,27 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
   def forbidden
     message = "The operation on organization #{Organization.current} was forbidden to user #{current_user.uid} with permissions #{current_user.permissions}"
     Rails.logger.info message
-    render_error 'forbidden', 403, locals: { explanation: :forbidden_explanation }, error_message: message
+    render_error 'forbidden', 403, locals: { error_code: :forbidden, explanation: :forbidden_explanation }, error_message: message
   end
 
   def disabled
-    render_error 'forbidden', 403, locals: { explanation: :disabled_explanation }
+    render_error 'forbidden', 403, locals: { error_code: :disabled, explanation: :disabled_explanation }
   end
 
   def blocked_forum
-    render_error 'forbidden', 403, locals: { explanation: :blocked_forum_explanation }
+    render_error 'forbidden', 403, locals: { error_code: :blocked_forum, explanation: :blocked_forum_explanation }
   end
 
   def gone
-    render_error 'gone', 410, locals: { explanation: :gone_explanation }
+    render_error 'gone', 410, locals: { error_code: :gone, explanation: :gone_explanation }
   end
 
   def unprepared_organization
-    render_error 'forbidden', 403, locals: { explanation: :unprepared_organization_explanation }
+    render_error 'forbidden', 403, locals: { error_code: :unprepared_organization, explanation: :unprepared_organization_explanation }
   end
 
   def disabled_organization
-    render_error 'gone', 410, locals: { explanation: :disabled_organization_explanation }
+    render_error 'gone', 410, locals: { error_code: :disabled_organization, explanation: :disabled_organization_explanation }
   end
 
   def render_error(template, status, options={})

data/lib/mumuki/laboratory/controllers/validate_access_mode.rb

@@ -6,7 +6,7 @@ module Mumuki::Laboratory::Controllers::ValidateAccessMode
   end
 
   def validate_accessible!
-    current_access_mode.validate_content_here! subject_container
+    current_access_mode.validate_content_here! subject_container unless contentless_subject?
     super
   end
 
@@ -14,6 +14,10 @@ module Mumuki::Laboratory::Controllers::ValidateAccessMode
     subject
   end
 
+  def contentless_subject?
+    false
+  end
+
   def accessible_subject
     nil
   end

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

@@ -74,8 +74,19 @@ en:
   created_at: Created at
   date: Date
   date_and_time: Date and time
+  delete_account: Delete account
+  delete_account_agree: I understand the consequences and want to delete my account
+  delete_account_confirmation_email_explain_html: <p>We've sent you an email to <strong>%{user_email}</strong> to continue with the removal process. </p><p> Please, check your inbox. If you have not received it, please contact us at <a href="mailto:%{disable_email}">%{disable_email}</a>.</p>
+  delete_account_confirmation_request: To confirm this action, please write
+  delete_account_explain: Upon deleting your account, you will lose access to your progress as well as your personal data.
+  delete_account_invalid_token: We are sorry, the link you followed here has expired or is invalid.
+  delete_account_modal_explain_html: To keep your account safe, we'll send you an email to <strong>%{user_email}</strong> to continue the deletion process.
+  delete_account_modal_lost_permissions: 'By deleting your account, you will lose access to the following courses:'
+  delete_account_mumuki: Delete your Mumuki account
+  delete_account_try_again_html: If you still want to delete your account, start the process again from <a href="%{profile_url}">your profile</a>.
   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.
+  deleted_user: Deleted User
   deletion_motive:
     inappropriate_content:
       present: Includes inappropriate content
@@ -106,6 +117,7 @@ en:
   edit_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
+  email_sent: Email sent
   error:
     title:
       forbidden: You are not allowed to see this content
@@ -199,23 +211,27 @@ en:
   locked_content: 'This content will be unlocked when you finish previous chapters'
   mailer:
     title:
+      custom: You have a new notification!
+      delete_account: Confirm account deletion
       exam_authorization_request_updated: There are updates in your exam registration
       exam_authorization_request_rejected: Exam registration rejected
       exam_registration: Exam registrations open
-      custom: You have a new notification!
     subtitle:
+      delete_account: You've requested to delete your Mumuki account
       exam_authorization_request_approved: Your registration request to the exam has been approved.
       exam_authorization_request_rejected: Your registration request to the exam has been rejected because the requirements weren't met.
       exam_registration: ¡You can register for the exam!
     text:
+      delete_account: Once your account is deleted, your progress and personal data will be deleted as well and you will not be able to access this account again or request the restoration of the deleted information. <br><br> This is irreversible and permanent. <br><br> Do you understand the consequences and still want to delete your account?
       exam_authorization_request_approved: You can sit for the exam on %{exam_start_date} by going into the platform. ¡Good luck!
       exam_authorization_request_rejected: ¡Don't be upset! You did a great job and we hope you'll keep learning programming.
       exam_registration: You have until %{exam_registration_deadline} to sign up. In order to be approved, you must meet the requirements.
     button:
+      custom: My notifications
+      delete_account: Delete Account
       exam_registration: Sign up for the exam
       exam_authorization_request_approved: Go to the platform
       exam_authorization_request_rejected: My exams
-      custom: My notifications
   male: Male
   manage_notification_subscriptions: Manage your notification subscriptions
   manage_notifications: Manage notifications
@@ -389,6 +405,7 @@ en:
   upvotes_count_asc: Least voted
   user: User
   user_data_updated: Your data was updated successfully
+  user_deleted_successfully: Your account was successfully deleted
   username: Username
   verified_full_name: Verified name
   verified_full_name_notice: Your verified name was provided by %{organization}. If there's a mistake, please send an email to %{contact}.

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

@@ -74,8 +74,19 @@ es-CL:
   created_guides: Lecciones Creadas
   date: Fecha
   date_and_time: Fecha y hora
+  delete_account: Eliminar cuenta
+  delete_account_agree: Enviar mail para eliminar cuenta
+  delete_account_confirmation_email_explain_html: <p>Te enviamos un correo electrónico a <strong>%{user_email}</strong> para continuar con el proceso de eliminación. </p><p> Por favor, revisá tu casilla. Si no lo recibiste, escríbenos a <a href="mailto:%{disable_email}">%{disable_email}</a>.</p>
+  delete_account_confirmation_request: Para confirmar esta acción, escribí
+  delete_account_explain: Al eliminar tu cuenta se eliminarán también tu progreso y todos tus datos personales.
+  delete_account_invalid_token: Lo sentimos, el enlace que utilizaste ha expirado o es inválido.
+  delete_account_modal_explain_html: Por cuestiones de seguridad, para eliminar tu cuenta te enviaremos un mail a tu casilla <strong>%{user_email}</strong>.
+  delete_account_modal_lost_permissions: 'Al eliminar tu cuenta perderás el acceso a los siguientes cursos:'
+  delete_account_mumuki: Eliminar tu cuenta de Mumuki
+  delete_account_try_again_html: Si todavía quieres eliminar tu cuenta, vuelve a iniciar el proceso desde <a href="%{profile_url}">tu perfil</a>.
   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.
+  deleted_user: Cuenta Eliminada
   deletion_motive:
     inappropriate_content:
       present: Incluye contenido inapropiado
@@ -107,6 +118,7 @@ es-CL:
   edit_message: Editar mensaje
   editor_placeholder: "...escribe tu solución acá..."
   email: Email
+  email_sent: Email enviado
   error_description: Esto es lo que se conoce como <span class="error-link">%{error}</span>.
   error_401: error 401
   error_403: error 403
@@ -203,23 +215,27 @@ es-CL:
   locked_content: 'Éste contenido se desbloqueará cuando termines los capítulos anteriores'
   mailer:
     title:
+      custom: ¡Tenés una nueva notificación!
+      delete_account: Confirmar eliminación de cuenta
       exam_authorization_request_updated: Tenés cambios en tu inscripción al examen
       exam_authorization_request_rejected: Inscripción rechazada
       exam_registration: Apertura de inscripciones
-      custom: ¡Tenés una nueva notificación!
     subtitle:
+      delete_account: Solicitaste eliminar tu cuenta de Mumuki
       exam_authorization_request_approved: Tu solicitud de inscripción al examen fue aprobada.
       exam_authorization_request_rejected: Tu solicitud de inscripción al examen fue rechazada ya que no se cumplieron los requisitos.
       exam_registration: ¡Ya podés inscribirte al examen!
     text:
+      delete_account: Una vez que se elimine tu cuenta se eliminarán también tu progreso y todos tus datos personales y no podrás volver a acceder a esta cuenta ni pedir la restitución futura de la información. <br><br> Esta acción es irreversible y permanente. <br><br> ¿Entiendes las consecuencias y aún así quieres eliminar tu cuenta?
       exam_authorization_request_approved: Podrás rendir el examen el día %{exam_start_date} ingresando a la plataforma. ¡Éxitos!
       exam_authorization_request_rejected: ¡No te desanimes! Hiciste un gran esfuerzo y esperamos que continúes aprendiendo programación.
       exam_registration: Tenés tiempo de inscribirte hasta el %{exam_registration_deadline}. Para que tu inscripción sea aceptada debés cumplir con los requisitos.
     button:
+      custom: Mis notificaciones
+      delete_account: Eliminar Cuenta
       exam_registration: Inscribirme al Examen
       exam_authorization_request_approved: Ir a la plataforma
       exam_authorization_request_rejected: Mis exámenes
-      custom: Mis notificaciones
   male: Hombre
   manage_notification_subscriptions: Administrá tus notificaciones
   manage_notifications: Administrar notificaciones
@@ -291,7 +307,7 @@ es-CL:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
-  organization_read_only_legend: 'Estás en modo lectura. Solo podrás acceder a los ejercicios que realizaste previamente y no podrás enviar nuevas soluciones'
+  organization_read_only_legend: 'Estás en Modo Lectura: como el curso ya finalizó no podrás enviar soluciones'
   other: Otro
   out_of_attempts: Te quedaste sin intentos. ¡Sigue al próximo ejercicio!
   output: Salida
@@ -403,6 +419,7 @@ es-CL:
   upvotes_count_desc: Más útiles
   upvotes_count_asc: Menos útiles
   user_data_updated: Tus datos se actualizaron correctamente
+  user_deleted_successfully: Tu cuenta fue eliminada exitosamente
   user: Usuario
   username: Nombre de usuario
   verified_full_name: Nombre verificado

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

@@ -79,8 +79,19 @@ es:
   created_guides: Lecciones Creadas
   date: Fecha
   date_and_time: Fecha y hora
+  delete_account: Eliminar cuenta
+  delete_account_agree: Enviar mail para eliminar cuenta
+  delete_account_confirmation_email_explain_html: <p>Te enviamos un correo electrónico a <strong>%{user_email}</strong> para continuar con el proceso de eliminación. </p><p> Por favor, revisá tu casilla. Si no lo recibiste, escribinos a <a href="mailto:%{disable_email}">%{disable_email}</a>.</p>
+  delete_account_confirmation_request: Para confirmar esta acción, escribí
+  delete_account_explain: Al eliminar tu cuenta se eliminarán también tu progreso y todos tus datos personales.
+  delete_account_invalid_token: Lo sentimos, el enlace que utilizaste ha expirado o es inválido.
+  delete_account_modal_explain_html: Por cuestiones de seguridad, para eliminar tu cuenta te enviaremos un mail a tu casilla <strong>%{user_email}</strong>.
+  delete_account_modal_lost_permissions: 'Al eliminar tu cuenta perderás el acceso a los siguientes cursos:'
+  delete_account_mumuki: Eliminar tu cuenta de Mumuki
+  delete_account_try_again_html: Si todavía querés eliminar tu cuenta, volvé a iniciar el proceso desde <a href="%{profile_url}">tu perfil</a>.
   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.
+  deleted_user: Cuenta Eliminada
   deletion_motive:
     inappropriate_content:
       present: Incluye contenido inapropiado
@@ -93,6 +104,7 @@ es:
       past: Divulgaba información personal
   day: Día
   days: Días
+  delete_account: Eliminar Cuenta
   description: Descripción
   destroy_message: eliminar el mensaje
   destroy: Eliminar
@@ -114,6 +126,7 @@ es:
   edit_profile: Editar perfil
   editor_placeholder: "...escribí tu solución acá..."
   email: Email
+  email_sent: Email enviado
   error_description: Esto es lo que se conoce como <span class="error-link">%{error}</span>.
   error_401: error 401
   error_403: error 403
@@ -212,23 +225,27 @@ es:
   locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
   mailer:
     title:
+      custom: ¡Tenés una nueva notificación!
+      delete_account: Confirmar eliminación de cuenta
       exam_authorization_request_updated: Tenés cambios en tu inscripción al examen
       exam_authorization_request_rejected: Inscripción rechazada
       exam_registration: Apertura de inscripciones
-      custom: ¡Tenés una nueva notificación!
     subtitle:
+      delete_account: Solicitaste eliminar tu cuenta de Mumuki
       exam_authorization_request_approved: Tu solicitud de inscripción al examen fue aprobada.
       exam_authorization_request_rejected: Tu solicitud de inscripción al examen fue rechazada ya que no se cumplieron los requisitos.
       exam_registration: ¡Ya podés inscribirte al examen!
     text:
+      delete_account: Una vez que se elimine tu cuenta se eliminarán también tu progreso y todos tus datos personales y no podrás volver a acceder a esta cuenta ni pedir la restitución futura de la información. <br><br> Esta acción es irreversible y permanente. <br><br> ¿Entendés las consecuencias y aún así querés eliminar tu cuenta?
       exam_authorization_request_approved: Podrás rendir el examen el día %{exam_start_date} ingresando a la plataforma. ¡Éxitos!
       exam_authorization_request_rejected: ¡No te desanimes! Hiciste un gran esfuerzo y esperamos que continúes aprendiendo programación.
       exam_registration: Tenés tiempo de inscribirte hasta el %{exam_registration_deadline}. Para que tu inscripción sea aceptada debés cumplir con los requisitos.
     button:
+      custom: Mis notificaciones
+      delete_account: Eliminar cuenta
       exam_registration: Inscribirme al Examen
       exam_authorization_request_approved: Ir a la plataforma
       exam_authorization_request_rejected: Mis exámenes
-      custom: Mis notificaciones
   male: Hombre
   manage_notification_subscriptions: Administrá tus notificaciones
   manage_notifications: Administrar notificaciones
@@ -300,7 +317,7 @@ es:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
-  organization_read_only_legend: 'Estás en modo lectura. Solo podrás acceder a los ejercicios que realizaste previamente y no podrás enviar nuevas soluciones'
+  organization_read_only_legend: 'Estás en Modo Lectura: como el curso ya finalizó no podrás enviar soluciones'
   other: Otro
   out_of_attempts: Te quedaste sin intentos. ¡Seguí al proximo ejercicio!
   output: Salida
@@ -417,6 +434,7 @@ es:
   upvotes_count_desc: Más útiles
   upvotes_count_asc: Menos útiles
   user_data_updated: Tus datos se actualizaron correctamente
+  user_deleted_successfully: Tu cuenta fue eliminada exitosamente
   user: Usuario
   username: Nombre de usuario
   verified_full_name: Nombre verificado

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

@@ -75,8 +75,19 @@ pt:
   created_guides: Lições criadas
   date: Data
   date_and_time: Data e hora
-  deleted_by: Removido pelo
+  delete_account: Deletar conta
+  delete_account_agree: Eu entendo as consequências e quero excluir minha conta
+  delete_account_confirmation_email_explain_html: <p> Enviamos a você um e-mail para <strong>%{user_email}</strong> para continuar com o processo de exclusão. </p><p> Por favor, verifique sua caixa. Se você não o recebeu, escreva para <a href="mailto:%{disable_email}">%{disable_email}</a>.</p>
+  delete_account_confirmation_request: Para confirmar esta ação, por favor escreva
+  delete_account_explain: Excluir sua conta também excluirá seu progresso e todos os seus dados pessoais.
+  delete_account_invalid_token: Desculpe, o link que você usou expirou ou é inválido.
+  delete_account_modal_explain_html: Por razões de segurança, para excluir sua conta, enviaremos um e-mail para seu e-mail <strong>%{user_email}</strong>.
+  delete_account_modal_lost_permissions: 'Ao deletar sua conta você perderá acesso aos seguintes cursos:'
+  delete_account_mumuki: Exclua sua conta Mumuki
+  delete_account_try_again_html: Se você ainda deseja excluir sua conta, inicie o processo novamente a partir de <a href="%{profile_url}">seu perfil</a>.
+  deleted_by: Removido pelo %{deleter}
   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.
+  deleted_user: Conta excluída
   deletion_motive:
     inappropriate_content:
       present: Inclui conteúdo impróprio
@@ -109,6 +120,7 @@ pt:
   edit_profile: Editar perfil
   editor_placeholder: ... Escreva sua solução aqui ...
   email: E-mail
+  email_sent: Email enviado
   error:
     title:
       forbidden: Você não tem autorização para ver esse conteúdo
@@ -203,23 +215,27 @@ pt:
   locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores'
   mailer:
     title:
+      custom: Você tem uma nova notificação!
+      delete_account: Confirme a exclusão da conta
       exam_authorization_request_updated: Você tem alterações no registro do seu exame
       exam_authorization_request_rejected: Inscrição rejeitada
       exam_registration: Abertura de inscrições
-      custom: Você tem uma nova notificação!
     subtitle:
+      delete_account: Você solicitou a exclusão de sua conta Mumuki
       exam_authorization_request_approved: Seu pedido de inscrição para o exame foi aprovado.
       exam_authorization_request_rejected: Sua inscrição para o exame foi rejeitada porque os requisitos não foram atendidos.
       exam_registration: Agora você pode se inscrever para o exame!
     text:
+      delete_account: Assim que sua conta for excluída, seu progresso e todos os seus dados pessoais também serão excluídos e você não poderá acessar esta conta novamente ou solicitar a restauração futura das informações. <br><br> Esta ação é irreversível e permanente. <br><br> Você entende as consequências e ainda deseja excluir sua conta?
       exam_authorization_request_approved: Você poderá fazer o exame em %{exam_start_date} ao entrar na plataforma. Êxitos!
       exam_authorization_request_rejected: Não te desanimes! Você fez um grande esforço e esperamos que continue aprendendo programação.
       exam_registration: Você tem tempo para se registrar até o exam_registration_deadline. Para que seu registro seja aceito, você deve atender aos requisitos.
     button:
+      custom: Minhas notificações
+      delete_account: Deletar conta
       exam_registration: Assinar o exame
       exam_authorization_request_approved: Vá para a plataforma
       exam_authorization_request_rejected: Meus exames
-      custom: Minhas notificações
   male: Masculino
   manage_notification_subscriptions: Gerenciar suas notificações
   manage_notifications: Gerenciar notificações
@@ -228,7 +244,6 @@ pt:
   message: Mensagem
   message_deleted: Esta mensagem foi excluída porque %{motive}, o que viola as %{forum_terms}.
   messages: Mensagens
-    mais tarde!
   messages_pluralized:
     one: Mensagem
     other: Mensagens
@@ -388,6 +403,7 @@ pt:
   to_solved: Marcar como resolvida
   toggle_read: "Marcar como lido / não lido"
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
+  user_deleted_successfully: Sua conta foi excluída com sucesso
   total: Total
   uncategorized: Não classificado
   unlocked_medal_as_avatar: Você ganhou essa medalha! Agora você pode escolhê-la como avatar.

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.20.0'
+    VERSION = '9.23.0'
   end
 end

data/spec/capybara_helper.rb

@@ -37,13 +37,11 @@ def selected_driver
     :selenium_headless
   when 'safari'
     :selenium_safari
-  else
-    :rack_test
   end
 end
 
 def run_with_selenium?
-  selected_driver.to_s.start_with? 'selenium'
+  selected_driver
 end
 
 def register_safari_driver!
@@ -97,10 +95,15 @@ def exclude_selenium_failing_tests!
   end
 end
 
-# Configuration
-
 register_safari_driver! if selected_driver == :selenium_safari
-Capybara.default_driver = selected_driver
+
+# If no driver is selected, it will use RackTest (fastest) except for tests that explicitly require JS support.
+# See https://github.com/teamcapybara/capybara#using-capybara-with-rspec for more details about this behavior.
+Capybara.default_driver = selected_driver || :rack_test
+Capybara.javascript_driver = selected_driver || :selenium_headless
+
+# Include port on the URL, so we don't need to forward it via nginx or so.
+Capybara.always_include_port = true
 
 # TODO: fix the tests that depend on hidden elements and remove this
 Capybara.ignore_hidden_elements = false
@@ -108,9 +111,6 @@ Capybara.ignore_hidden_elements = false
 if run_with_selenium?
   register_request_headers_workaround!
   exclude_selenium_failing_tests!
-
-  # Include port on the URL, so we don't need to forward it via nginx or so
-  Capybara.always_include_port = true
 end
 
-puts "Running Capybara tests with #{selected_driver}, #{Capybara.ignore_hidden_elements ? '' : 'not '}ignoring hidden elements"
+puts "Running Capybara tests with #{Capybara.default_driver}, #{Capybara.ignore_hidden_elements ? '' : 'not '}ignoring hidden elements"

data/spec/controllers/discussions_messages_controller_spec.rb

@@ -32,7 +32,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
   end
 
   describe 'delete' do
-    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+    let(:message) { create(:message, discussion: discussion, sender: student) }
 
     describe 'for student' do
       before { set_current_user! student }
@@ -64,7 +64,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
       end
 
       describe 'someone else\'s message' do
-        let(:message) { create(:message, discussion: discussion, sender: moderator.uid) }
+        let(:message) { create(:message, discussion: discussion, sender: moderator) }
         before do
           delete :destroy, params: {id: message.id, discussion_id: discussion.id, motive: :self_deleted}
           message.reload
@@ -94,7 +94,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
   end
 
   describe 'approve' do
-    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+    let(:message) { create(:message, discussion: discussion, sender: student) }
 
     describe 'for student' do
       before { set_current_user! student }
@@ -114,7 +114,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
   end
 
   describe 'question' do
-    let(:message) { create(:message, discussion: discussion, sender: student.uid) }
+    let(:message) { create(:message, discussion: discussion, sender: student) }
 
     describe 'for student' do
       before { set_current_user! student }
@@ -133,7 +133,7 @@ describe DiscussionsMessagesController, type: :controller, organization_workspac
     end
 
     describe 'preview' do
-      let(:message) { create(:message, content: 'Message in **bold** and _italics_', discussion: discussion, sender: student.uid) }
+      let(:message) { create(:message, content: 'Message in **bold** and _italics_', discussion: discussion, sender: student) }
 
       describe 'for student' do
         before { set_current_user! student }

data/spec/controllers/messages_controller_spec.rb

@@ -11,10 +11,10 @@ describe MessagesController, organization_workspace: :test do
 
     it { expect(response.status).to eq 302 }
     it { expect(user.assignments.size).to eq 1 }
-    it { expect(user.messages.size).to eq 1 }
+    it { expect(user.direct_messages.size).to eq 1 }
 
     describe 'deleting exercises does delete all messages' do
-      before { @message_id = user.messages.first.id }
+      before { @message_id = user.direct_messages.first.id }
       before { exercise.destroy }
 
       it { expect { Message.find(@message_id) }.to raise_exception(ActiveRecord::RecordNotFound) }
@@ -27,6 +27,6 @@ describe MessagesController, organization_workspace: :test do
 
     it { expect(response.status).to eq 302 }
     it { expect(user.assignments.size).to eq 1 }
-    it { expect(user.messages.size).to eq 1 }
+    it { expect(user.direct_messages.size).to eq 1 }
   end
 end

data/spec/controllers/users_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe UsersController, type: :controller, organization_workspace: :test do
-  let(:user) { create(:user) }
+  let(:user) { create(:user, email: 'pirulo@mail.com') }
 
   let(:user_json) do
     {
@@ -67,4 +67,23 @@ describe UsersController, type: :controller, organization_workspace: :test do
       end
     end
   end
+
+  context 'send_delete_confirmation_email' do
+    let(:last_email) { ActionMailer::Base.deliveries.last }
+    before { set_current_user! user }
+    before { post :send_delete_confirmation_email }
+
+    context 'sends a delete confirmation email' do
+      it { expect(last_email.to).to eq ['pirulo@mail.com'] }
+      it { expect(last_email.subject).to have_content 'Delete your Mumuki account' }
+    end
+
+    context 'adds a delete token to the user' do
+      it { expect(user.reload.delete_account_token).not_to be_nil }
+    end
+
+    context 'redirects to confirmation view' do
+      it { expect(response).to redirect_to(delete_request_user_path) }
+    end
+  end
 end

data/spec/dummy/config/environments/development.rb

@@ -26,10 +26,16 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
-  # Don't care if the mailer can't send.
-  config.action_mailer.perform_deliveries = false
+  config.reminder_sender_email = 'no-reply@mumuki.org'
+  config.support_email = 'soporte@mumuki.org'
+  config.disable_email = 'bajas@mumuki.org'
 
   config.action_mailer.perform_caching = false
+  config.action_mailer.raise_delivery_errors = false
+
+  # Settings for mailcatcher, run `mailcatcher` and go to http://localhost:1080/ to see which emails have been sent.
+  config.action_mailer.smtp_settings = { :address => '127.0.0.1', :port => 1025 }
+  config.action_mailer.delivery_method = :smtp
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

data/spec/dummy/config/environments/test.rb

@@ -49,6 +49,9 @@ Rails.application.configure do
                            credentials: {},
                            info: {first_name: 'John', last_name: 'Doe', name: 'John Doe', nickname: 'johndoe'}
 
-  config.reminder_sender_email = 'support@mumuki.org'
+  config.reminder_sender_email = 'no-reply@mumuki.org'
+  config.support_email = 'soporte@mumuki.org'
+  config.disable_email = 'bajas@mumuki.org'
+
   config.reminder_frequency = 7
 end