mumuki-laboratory 9.0.6 → 9.1.0

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
@@ -176,6 +188,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 +272,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 +344,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
@@ -187,6 +199,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 +287,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 +360,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
@@ -181,6 +192,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 +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
@@ -329,7 +342,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.1.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/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

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/helpers/breadcrumbs_helper_spec.rb

@@ -46,7 +46,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
     end
 
     context 'in chapter' do
-      let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson]) }
+      let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson], number: 1) }
       let(:lesson) { create(:lesson, name: 'my lesson', exercises: [exercise]) }
       let(:exercise) { create(:exercise, name: 'my exercise') }
 
@@ -64,7 +64,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
       it 'mumuki, organization, chapter and lesson have links but exercise does not' do
         expect(breadcrumb).to include home_breadcrumb_with_link
         expect(breadcrumb).to include organization_breadcrumb_with_link
-        expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">my chapter</a>"
+        expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">1. my chapter</a>"
         expect(breadcrumb).to include "<a href=\"/lessons/#{lesson.id}-my-chapter-my-lesson\">1. my lesson</a>"
         expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>"
       end

data/spec/helpers/with_navigation_spec.rb

@@ -14,9 +14,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
       let!(:exercise_3) { create(:exercise, id: 13, name: 'exercise 3', guide: guide) }
 
       context 'when user did not submit any solution' do
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_1.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_1.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when on last unresolved exercise' do
@@ -25,9 +25,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           exercise_3.submit_solution!(current_user).passed!
         end
 
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
         it { expect(next_button(exercise_2)).to be nil }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when user did submit a solution' do
@@ -35,9 +35,9 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           exercise_1.submit_solution!(current_user).passed!
         end
 
-        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/exercises/#{exercise_3.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 3</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
     end
 
@@ -46,8 +46,8 @@ describe WithStudentPathNavigation, organization_workspace: :test do
       let!(:exercise) { create(:exercise, id: 12, name: 'exercise 2', guide: guide) }
 
       context 'when user did not submit any exercise' do
-        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-success btn-block\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/#{reading.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-complementary w-100\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/exercises/#{reading.friendly_name}\"><span class=\"fa5-text-r\">Next pending: exercise 1</span><i class=\"fas fa-chevron-right\"></i></a>" }
       end
 
       context 'when user finished just reading' do
@@ -55,7 +55,7 @@ describe WithStudentPathNavigation, organization_workspace: :test do
           reading.submit_confirmation!(current_user)
         end
 
-        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-success btn-block\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
+        it { expect(next_button(reading)).to eq "<a class=\"btn-confirmation btn btn-complementary w-100\" data-confirmation-url=\"/exercises/#{reading.friendly_name}/confirmations\" role=\"button\" href=\"/exercises/#{exercise.friendly_name}\"><span class=\"fa5-text-r\">Next: exercise 2</span><i class=\"fas fa-chevron-right\"></i></a>" }
         it { expect(next_button(exercise)).to eq nil }
       end
     end
@@ -83,15 +83,38 @@ describe WithStudentPathNavigation, organization_workspace: :test do
         let(:lessons) { [lesson_1, lesson_2, lesson_3] }
 
         context 'one suggestion' do
-          it { expect(next_button(lesson_2)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{lesson_3.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_3.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_2)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/lessons/#{lesson_3.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_3.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
           it { expect(next_button(lesson_1)).to be_html_safe }
         end
 
         context 'many suggestions' do
-          it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{lesson_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/lessons/#{lesson_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{lesson_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
           it { expect(next_button(lesson_1)).to be_html_safe }
         end
       end
     end
+
+    context "when there's a next chapter" do
+      let(:organization) { create :organization, book: book }
+
+      let(:book) { create(:book, chapters: [
+        chapter_1,
+        chapter_2
+      ]) }
+
+      let(:chapter_1) { create(:chapter, lessons: [lesson_1]) }
+      let(:chapter_2) { create(:chapter, lessons: [create(:lesson, exercises: [ create(:exercise) ])]) }
+
+      let(:lesson_1) { create(:lesson, exercises: [ exercise_1 ]) }
+      let(:exercise_1) { create(:exercise) }
+
+      before do
+        organization.switch!
+        reindex_current_organization!
+        exercise_1.submit_solution!(current_user).passed!
+      end
+
+      it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/chapters/#{chapter_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{chapter_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+    end
   end
 end

data/spec/javascripts/editors-spec.js

@@ -22,7 +22,7 @@ describe('editors', () => {
   it('reads the custom sources if present, ignoring the form', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea class="form-control editor" name="solution[content]" id="solution_content">the standard solution</textarea>
       </div>
     </form>`);
@@ -39,7 +39,7 @@ describe('editors', () => {
   it('reads the form if no sources', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea class="form-control editor" name="solution[content]" id="solution_content">the solution</textarea>
       </div>
     </form>`);
@@ -49,7 +49,7 @@ describe('editors', () => {
   it('reads the form if no sources and exercise is multifile', () => {
     $('body').html(`
     <form role="form" class="new_solution">
-      <div class="field form-group editor-code">
+      <div class="editor-code">
         <textarea
           class="form-control editor"
           data-editor-language="html"