mumuki-laboratory 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd2970f76639e5a75d8d495a6d5ee9ae48a9a840be70da8a1c5e58f6c20ff63
-  data.tar.gz: e792444dc5edde15edd40d5b2e82f9cea756a0956af8c63fa38a7e9ba739ed7f
+  metadata.gz: a38780814278c34989e9d89e4ef78364eb0b5e8ccca49e772414fe7e0b02c166
+  data.tar.gz: 37e8c5cb9a0cc951b83f1905e2d7b309896a24fc2d839935c30676c3360cce2a
 SHA512:
-  metadata.gz: 6dddff8d4c0629e18cda7a408fb3a813a196c1e289f25cc0940566a8d5fc0e2d6746d9576999364dc29a001a5431126b7fada46d605a7c249a1308a81aa8584e
-  data.tar.gz: 16f81fc42792c57a868d891fb9c8d761499de386e55611b858b2c7f4c91f5939077380a34fc5f4267c1c71f721c6c32a366e5225a3db67ac3b723a07e0ef58be
+  metadata.gz: 6c8f2296e19c21428a37d6e46abdba9e19dab518b262a149c8de6bc66d3bf9aabb84baeed171cc7aed3b1ac5e706355d46bf9200da4e4f6791a4d202891156ff
+  data.tar.gz: 87708300550f167df2bbba5f50ab9bec08e60b5513f38d7f7af9121b8391ae432b974151b913d89aa93956ffeff7dc331f7a81973a1f187a8cc36730fc7ea0a3

data/app/views/book/show.html.erb

@@ -30,11 +30,11 @@
     </div>
   <% end %>
 
-  <h2><%= t(:content) %></h2>
+  <h2><%= t(:chapters) %></h2>
 
   <% @book.chapters.each do |it| %>
     <div class="chapter">
-      <h3><%= t(:chapter_number, number: it.number) %> <%= link_to_path_element it, mode: :plain %></h3>
+      <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
 
       <div class="text-box">
         <%= it.description_teaser_html %>
@@ -54,3 +54,5 @@
     <% end %>
   <% end %>
 </div>
+
+<%= render partial: 'layouts/progress', locals: { content: @book } %>

data/app/views/chapters/show.html.erb

@@ -14,10 +14,10 @@
 
 <% if @chapter.lessons.present? %>
 <div>
-  <h3><%= t(:content) %></h3>
+  <h3><%= t(:lessons) %></h3>
 
   <% @chapter.lessons.each do |lesson| %>
-    <h4><%= t(:lesson_number, number: lesson.number) %>: <%= link_to_path_element lesson, mode: :plain %></h4>
+    <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
     <%= render partial: 'layouts/progress_listing', locals: {exercises: lesson.exercises} %>
   <% end %>
 </div>
@@ -31,3 +31,5 @@
     </p>
   </div>
 <% end %>
+
+<%= render partial: 'layouts/progress', locals: { content: @chapter.topic } %>

data/app/views/layouts/_guide.html.erb

@@ -37,7 +37,7 @@
 </div>
 
 <h3>
-  <%= t :content %>
+  <%= t :exercises %>
   <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
 </h3>
 
@@ -63,3 +63,5 @@
     </div>
   </div>
 <% end %>
+
+<%= render partial: 'layouts/progress', locals: { content: @guide } %>

data/app/views/layouts/_progress.html.erb

@@ -0,0 +1 @@
+<% content.completion_percentage_for(current_user) %>

data/config/initializers/session_store.rb

@@ -1 +1 @@
-Rails.application.config.session_store :cookie_store, key: '_mumuki_laboratory_session'
+Rails.application.config.session_store :cookie_store, key: '_mumuki_laboratory_session', same_site: Mumukit::Login::Mucookie.cookie_same_site

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

@@ -40,6 +40,6 @@ module Mumuki::Laboratory::Controllers::EmbeddedMode
   private
 
   def allow_parent_iframe!
-    response.set_header 'X-Frame-Options', 'ALLOWALL'
+    response.delete_header 'X-Frame-Options'
   end
 end

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

@@ -28,6 +28,7 @@ en:
   blocked_forum_explanation: You are not allowed to see this content. <br> Are you in the middle of an exam right now?
   cancel_subscription: Cancel your subscription.
   chapter: Chapter
+  chapters: Chapters
   chapter_finished_html: You have finished %{chapter}!
   chapter_number: Chapter %{number}
   classroom_ui: Classroom
@@ -70,6 +71,7 @@ en:
   exam_number: 'Exam %{number}:'
   exams: Exams
   exercise: Exercise
+  exercises: Exercises
   exercise_count: exercises
   exercise_done: All our tests passed!
   exercise_number: Exercise %{number}
@@ -110,6 +112,7 @@ en:
   latest_exercises: Latest exercises
   learning: Learning
   lesson: Lesson
+  lessons: Lessons
   lesson_number: Lesson %{number}
   let_us_know: please let us know!
   loading: Loading

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

@@ -30,6 +30,7 @@ es:
   blocked_forum_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que estés en medio de un examen?
   cancel_subscription: Cancelá tu subscripción.
   chapter: Capítulo
+  chapters: Capítulos
   chapter_finished_html: ¡Terminaste %{chapter}! ¡Felicitaciones!
   chapter_number: 'Capítulo %{number}'
   classroom_ui: Aula
@@ -122,6 +123,7 @@ es:
   latest_exercises: Últimos ejercicios
   learning: Aprendizaje
   lesson: Lección
+  lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avisanos!
   loading: Cargando

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

@@ -28,6 +28,7 @@ pt:
   birthdate: Fecha de nacimiento
   blocked_forum_explanation: Você não tem permissão para ver este conteúdo. <br> Você está no meio de um exame agora?
   chapter: Capítulo
+  chapters: Capítulos
   chapter_finished_html: Você terminou %{chapter}! Parabéns!
   chapter_number: Capítulo %{number}
   classroom_ui: Sala de aula
@@ -117,6 +118,7 @@ pt:
   latest_exercises: Últimos exercícios
   learning: Aprendendo
   lesson: Lição
+  lessons: Lições
   lesson_number: Lição %{number}
   let_us_know: Por favor, avise-nos!
   loading: Carregando

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.1.0'
+    VERSION = '7.2.0'
   end
 end

data/spec/controllers/confirmations_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ExerciseConfirmationsController, organization_workspace: :test do
   let(:user) { create(:user) }
-  let(:reading) { create(:reading) }
+  let(:reading) { create(:reading, guide: create(:indexed_guide)) }
 
   context 'when not authenticated' do
     before { post :create, params: { exercise_id: reading.id } }

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: 20190929180601) do
+ActiveRecord::Schema.define(version: 20200213175736) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -43,8 +43,10 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.integer "attemps_count", default: 0
     t.bigint "organization_id"
     t.datetime "submitted_at"
+    t.bigint "parent_id"
     t.index ["exercise_id"], name: "index_assignments_on_exercise_id"
     t.index ["organization_id"], name: "index_assignments_on_organization_id"
+    t.index ["parent_id"], name: "index_assignments_on_parent_id"
     t.index ["submission_id"], name: "index_assignments_on_submission_id"
     t.index ["submitter_id"], name: "index_assignments_on_submitter_id"
   end
@@ -56,6 +58,7 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.string "locale", default: "en"
     t.text "description"
     t.string "slug"
+    t.boolean "private", default: false
     t.index ["slug"], name: "index_books_on_slug", unique: true
   end
 
@@ -162,7 +165,6 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.boolean "extra_visible", default: false
     t.boolean "manual_evaluation", default: false
     t.integer "editor", default: 0, null: false
-    t.string "choice_values", default: [], null: false, array: true
     t.text "goal"
     t.string "initial_state"
     t.string "final_state"
@@ -203,6 +205,24 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.index ["slug"], name: "index_guides_on_slug", unique: true
   end
 
+  create_table "indicators", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "organization_id"
+    t.bigint "parent_id"
+    t.string "content_type"
+    t.bigint "content_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "dirty_by_content_change", default: false
+    t.boolean "dirty_by_submission", default: false
+    t.integer "children_passed_count"
+    t.integer "children_count"
+    t.index ["content_type", "content_id"], name: "index_indicators_on_content_type_and_content_id"
+    t.index ["organization_id"], name: "index_indicators_on_organization_id"
+    t.index ["parent_id"], name: "index_indicators_on_parent_id"
+    t.index ["user_id"], name: "index_indicators_on_user_id"
+  end
+
   create_table "invitations", id: :serial, force: :cascade do |t|
     t.string "code"
     t.datetime "expiration_date"
@@ -301,6 +321,7 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.datetime "updated_at"
     t.text "appendix"
     t.string "slug"
+    t.boolean "private", default: false
     t.index ["slug"], name: "index_topics_on_slug", unique: true
   end
 
@@ -343,6 +364,8 @@ ActiveRecord::Schema.define(version: 20190929180601) do
     t.datetime "last_reminded_date"
     t.date "birthdate"
     t.integer "gender"
+    t.string "verified_first_name"
+    t.string "verified_last_name"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"
     t.index ["uid"], name: "index_users_on_uid", unique: true
   end

data/spec/features/guides_flow_spec.rb

@@ -55,14 +55,14 @@ feature 'Guides Flow', organization_workspace: :test do
         visit "/guides/#{complement.guide.id}"
 
         expect(page).to have_text('a complement')
-        expect(page).to have_text('Content')
+        expect(page).to have_text('Exercises')
       end
 
       scenario 'visit lesson by id' do
         visit "/guides/#{lesson.guide.id}"
 
         expect(page).to have_text('awesomeGuide')
-        expect(page).to have_text('Content')
+        expect(page).to have_text('Exercises')
         expect(page).to_not have_text('Creative Commons')
       end
 
@@ -72,7 +72,7 @@ feature 'Guides Flow', organization_workspace: :test do
 
         expect(page).to have_text('awesomeGuide')
         expect(page).to have_text('An awesome guide')
-        expect(page).to have_text('Content')
+        expect(page).to have_text('Exercises')
       end
     end
 
@@ -83,7 +83,7 @@ feature 'Guides Flow', organization_workspace: :test do
         visit "/guides/#{lesson.guide.id}"
 
         expect(page).to have_text('awesomeGuide')
-        expect(page).to have_text('Content')
+        expect(page).to have_text('Exercises')
         expect(page).to have_text('Jon Doe')
         expect(page).to have_text('Creative Commons')
       end

data/spec/features/login_flow_spec.rb

@@ -19,8 +19,7 @@ feature 'Login Flow', organization_workspace: :test do
     click_on 'Sign in'
 
     expect(page).to have_text('Start Practicing!')
-    expect(page).to have_text('Content')
-    expect(page).to have_text('Chapter')
+    expect(page).to have_text('Chapters')
     expect(page).to_not have_text('Sign in')
     expect(page).to have_text('Sign Out')
   end
@@ -54,8 +53,7 @@ feature 'Login Flow', organization_workspace: :test do
     expect(page).to have_text('Sign Out')
     click_on 'Sign Out'
 
-    expect(page).to have_text('Content')
-    expect(page).to have_text('Chapter')
+    expect(page).to have_text('Chapters')
 
     expect(page).to have_text('Sign in')
     expect(page).to_not have_text('Sign out')

data/spec/features/standard_flow_spec.rb

@@ -23,7 +23,7 @@ feature 'Standard Flow', organization_workspace: :test do
 
     expect(page).to have_text('Values and Functions')
     expect(page).to have_text('Values are everywhere...')
-    expect(page).to have_text('Content')
+    expect(page).to have_text('Exercises')
     expect(page).to have_text('The Basic Values')
     expect(page).to have_text('Start this lesson!')
     expect(page).to_not have_text("Let's say we")

data/spec/features/topic_flow_spec.rb

@@ -15,7 +15,7 @@ feature 'Topic Flow', organization_workspace: :test do
     visit "/topics/#{topic_in_path.transparent_id}"
 
     expect(page).to have_text('Functional Programming')
-    expect(page).to have_text('Content')
+    expect(page).to have_text('Lessons')
   end
 
   scenario 'visit topic in path not transparently' do

data/spec/helpers/exercise_input_helper_spec.rb

@@ -49,7 +49,7 @@ describe ApplicationHelper, organization_workspace: :test do
     end
     context 'when assignment passed' do
       let(:organization) { create(:organization, name: 'myorg', forum_enabled: true) }
-      let(:assignment) { create(:assignment, status: :passed) }
+      let(:assignment) { create(:assignment, status: :passed, exercise: create(:indexed_exercise)) }
       it { expect(should_render_need_help_dropdown? assignment, organization).to be false }
     end
   end

data/spec/helpers/icons_helper_spec.rb

@@ -11,7 +11,9 @@ describe IconsHelper, organization_workspace: :test do
   end
 
   describe '#status_icon' do
-    let(:passed_submission) { create(:assignment, status: :passed, expectation_results: []) }
+    let(:passed_submission) {
+      create(:assignment, status: :passed, expectation_results: [], exercise: create(:indexed_exercise))
+    }
     let(:failed_submission) { create(:assignment, status: :failed) }
 
     it { expect(status_icon(passed_submission)).to eq '<i class="fa fa-check-circle text-success status-icon"></i>' }

data/spec/helpers/with_navigation_spec.rb

@@ -5,23 +5,18 @@ describe WithStudentPathNavigation, organization_workspace: :test do
   helper FontAwesome::Rails::IconHelper
 
   describe '#next_button' do
-    context 'with problems' do
-      let(:lesson) { create(:lesson, name: 'my guide', exercises: [
-        create(:exercise, id: 11, name: 'exercise 1'),
-        create(:exercise, id: 12, name: 'exercise 2'),
-        create(:exercise, id: 13, name: 'exercise 3')
-      ]) }
-
-      let!(:exercise_1) { lesson.exercises.first }
-      let!(:exercise_2) { lesson.exercises.second }
-      let!(:exercise_3) { lesson.exercises.third }
+    let(:current_user) { create(:user) }
+    let(:guide) { create(:indexed_guide) }
 
-      let(:current_user) { create(:user) }
+    context 'with problems' do
+      let!(:exercise_1) { create(:exercise, id: 11, name: 'exercise 1', guide: guide) }
+      let!(:exercise_2) { create(:exercise, id: 12, name: 'exercise 2', guide: guide) }
+      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/12-exercise-2\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/13-exercise-3\">Next: exercise 3 <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/11-exercise-1\">Next pending: exercise 1 <i class=\"fa fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\">Next: exercise 2 <i class=\"fa 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}\">Next: exercise 3 <i class=\"fa 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}\">Next pending: exercise 1 <i class=\"fa fa-chevron-right\"></i></a>" }
       end
 
       context 'when on last unresolved exercise' do
@@ -30,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/12-exercise-2\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\">Next: exercise 2 <i class=\"fa 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/12-exercise-2\">Next pending: exercise 2 <i class=\"fa 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}\">Next pending: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
       end
 
       context 'when user did submit a solution' do
@@ -40,26 +35,19 @@ 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/12-exercise-2\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_2)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/13-exercise-3\">Next: exercise 3 <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise_3)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/12-exercise-2\">Next pending: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
+        it { expect(next_button(exercise_1)).to eq "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/exercises/#{exercise_2.friendly_name}\">Next: exercise 2 <i class=\"fa 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}\">Next: exercise 3 <i class=\"fa 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}\">Next pending: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
       end
     end
 
     context 'with non-terminal readings' do
-      let(:lesson) { create(:lesson, name: 'my guide', exercises: [
-        create(:reading, id: 11, name: 'exercise 1'),
-        create(:exercise, id: 12, name: 'exercise 2')
-      ]) }
-
-      let!(:reading) { lesson.exercises.first }
-      let!(:exercise) { lesson.exercises.second }
-
-      let(:current_user) { create(:user) }
+      let!(:reading) { create(:reading, id: 11, name: 'exercise 1', guide: guide) }
+      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/11-exercise-1/confirmations\" role=\"button\" href=\"/exercises/12-exercise-2\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(exercise)).to eq "<a class=\"btn btn-warning btn-block\" role=\"button\" href=\"/exercises/11-exercise-1\">Next pending: exercise 1 <i class=\"fa fa-chevron-right\"></i></a>" }
+        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}\">Next: exercise 2 <i class=\"fa 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}\">Next pending: exercise 1 <i class=\"fa fa-chevron-right\"></i></a>" }
       end
 
       context 'when user finished just reading' do
@@ -67,49 +55,43 @@ 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/11-exercise-1/confirmations\" role=\"button\" href=\"/exercises/12-exercise-2\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
+        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}\">Next: exercise 2 <i class=\"fa fa-chevron-right\"></i></a>" }
         it { expect(next_button(exercise)).to eq nil }
       end
     end
 
-
     context 'with guides' do
-      let!(:current_user) { create(:user) }
+      let(:lesson_1) { create(:lesson, exercises: create_list(:exercise, 1)) }
+      let(:lesson_2) { create(:lesson, exercises: create_list(:exercise, 1)) }
+      let(:lesson_3) { create(:lesson, exercises: create_list(:exercise, 1)) }
 
       context 'when guide has no suggestions' do
-        let(:exercise) { build(:exercise) }
-        let(:lesson) { create(:lesson, name: 'Guide A', exercises: [exercise]) }
-        let(:chapter) { create(:chapter, lessons: [lesson]) }
+        let(:exercise) { create(:exercise, guide: create(:indexed_guide)) }
+        let(:lesson) { exercise.guide.lesson }
 
-        before { reindex_current_organization! }
         before { exercise.submit_solution!(current_user).passed! }
 
         it { expect(next_button(lesson)).to be nil }
       end
 
-      context 'when guide has one suggestion' do
-        let!(:suggested_lesson) { create(:lesson, name: 'l3') }
-        let!(:lesson) { create(:lesson, name: 'l2') }
-        let!(:another_lesson) { create(:lesson, name: 'l1') }
-        let!(:chapter) { create(:chapter, lessons: [another_lesson, lesson, suggested_lesson]) }
-
-        before { reindex_current_organization! }
-
-        it { expect(next_button(lesson)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{suggested_lesson.friendly_name}\">Next: #{suggested_lesson.name} <i class=\"fa fa-chevron-right\"></i></a>" }
-      end
+      context 'when guide has' do
+        before do
+          create(:chapter, lessons: lessons)
+          reindex_current_organization!
+        end
 
-      context 'when guide has many suggestions' do
-        let!(:suggested_lesson_1) { create(:lesson) }
-        let!(:suggested_lesson_2) { create(:lesson) }
-        let!(:lesson) { create(:lesson) }
-        let!(:chapter) { create(:chapter, lessons: [lesson, suggested_lesson_1, suggested_lesson_2]) }
+        let(:lessons) { [lesson_1, lesson_2, lesson_3] }
 
-        before { reindex_current_organization! }
+        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}\">Next: #{lesson_3.name} <i class=\"fa fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_1)).to be_html_safe }
+        end
 
-        it { expect(next_button(lesson)).to include "<a class=\"btn btn-success btn-block\" role=\"button\" href=\"/lessons/#{suggested_lesson_1.friendly_name}\">Next: #{suggested_lesson_1.name} <i class=\"fa fa-chevron-right\"></i></a>" }
-        it { expect(next_button(lesson)).to be_html_safe }
+        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}\">Next: #{lesson_2.name} <i class=\"fa fa-chevron-right\"></i></a>" }
+          it { expect(next_button(lesson_1)).to be_html_safe }
+        end
       end
     end
   end
-
 end