mumuki-laboratory 9.18.1 → 9.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae29f9665d934e9d1a3ef71a67074980155c36eabd6dc0ee5d66ddcc7c6cea3
-  data.tar.gz: 5a9158cd4bec4155c1890241f2dab4d87889c87d0b9143d572bc63cc4e925f99
+  metadata.gz: e520213e1d2d2cd643b0ee1d9506324394a18978ea319f8f0c7917a1bfba8c2b
+  data.tar.gz: a8e99258a755b5fbe2a2f3b4927b1102ebbcee837e995839bf1989324ff783af
 SHA512:
-  metadata.gz: 9cafbd64b3e29e4005bb51c3da4a3e45a7532295a34e4e7727185af580544ca9ff614f0c7b15496f9a043e6dd9c8d3becc82282a9f4deb6cbfec6c3e09fa78ed
-  data.tar.gz: ecf6beb36af7772043cb3775523373b38db0cdbc58ebe316b9fd4239decf8610c9ea7200b1fc4954be83765a2f71a1d97e75621814c19dcccb5984a1ac4f17ec
+  metadata.gz: 51562ad86aab9f22e3c6ae6a651bdc22cdd84159eb9394122b12ff885f19ceac51b375544e852870a3c80ec689fd5bf98e9291c8797dddf444887269cb006ddc
+  data.tar.gz: eb8b795ebfdd92ccb48d571558c5cba3866fb09ce03217f8a5a22cd82799a5bec70bcf97e8aa71789ca21d2d484c0ae928db7aa3b9fb955bb573d57af896cbcc

data/app/assets/javascripts/mumuki_laboratory/application/timer.js

@@ -1,9 +1,6 @@
 mumuki.startTimer = (() => {
-  function startTimer(endDate) {
-    var endTime = new Date(endDate).getTime();
-    var currentTime = Date.now();
-    var diffTime = endTime - currentTime;
-    var duration = moment.duration(diffTime, 'milliseconds');
+  function startTimer(seconds) {
+    var duration = moment.duration(seconds, 'seconds');
     var intervalDuration = 1000;
 
     var interval = mumuki.setInterval(function () {

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -34,14 +34,6 @@
   background-image: none;
 }
 
-.alert {
-  margin: 10px 50px 10px 15px;
-}
-
-.alert-danger a {
-  color: greenyellow;
-}
-
 .exercise-search-box {
   width: 263px;
   position: fixed

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss

@@ -7,6 +7,7 @@
 
 .mu-profile-actions {
   margin-left: auto;
+  text-align: center;
 
   .btn {
     width: 150px;
@@ -18,15 +19,6 @@
       border-color: lighten($mu-color-complementary, 15%);
     }
   }
-
-  &.mobile {
-    text-align: center;
-    margin: 20px 5px -20px -10px;
-
-    .btn {
-      width: calc(50% - 20px);
-    }
-  }
 }
 
 .mu-profile-info {

data/app/assets/stylesheets/mumuki_laboratory/application.scss

@@ -13,5 +13,4 @@ $da-font-path: asset-path('assets');
 @import "application/invitations";
 @import "application/modules";
 @import "application/errors";
-@import "application/alerts";
 @import "application/codemirror-themes";

data/app/controllers/appendixes_controller.rb

@@ -1,5 +1,12 @@
 class AppendixesController < ApplicationController
+
   def show
     @chapter = Chapter.find(params[:chapter_id])
   end
+
+  private
+
+  def authorization_minimum_role
+    :ex_student
+  end
 end

data/app/controllers/application_controller.rb

@@ -44,7 +44,8 @@ class ApplicationController < ActionController::Base
                 :theme_stylesheet_url,
                 :extension_javascript_url,
                 :current_immersive_path,
-                :current_access_mode
+                :current_access_mode,
+                :limited_query?
 
   add_flash_types :info
 
@@ -129,7 +130,6 @@ class ApplicationController < ActionController::Base
   def validate_user_profile!
     unless current_user.profile_completed?
       save_location_before! :profile_completion
-      flash[:info] = I18n.t :please_fill_profile_data
       redirect_to edit_user_path
     end
   end
@@ -171,4 +171,8 @@ class ApplicationController < ActionController::Base
       current_user.restore_organization_progress!(Organization.current)
     end
   end
+
+  def limited_query?
+    params[:limit].present?
+  end
 end

data/app/controllers/complements_controller.rb

@@ -1,8 +1,21 @@
 class ComplementsController < GuideContainerController
+  include Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   private
 
   def subject
     @complement ||= Complement.find_by(id: params[:id])
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
+
+  def subject_container
+    subject.guide
+  end
+
+  def contentless_subject?
+    subject_container.exercises.empty?
+  end
 end

data/app/helpers/application_helper.rb

@@ -17,7 +17,9 @@ module ApplicationHelper
   end
 
   def paginate(object, options = {})
-    super(object, {theme: 'bootstrap-5', pagination_class: 'flex-wrap justify-content-center'}.merge(options))
+    unless limited_query?
+      super(object, {theme: 'bootstrap-5', pagination_class: 'flex-wrap justify-content-center'}.merge(options))
+    end
   end
 
   def last_box_class(trailing_boxes)

data/app/helpers/discussions_helper.rb

@@ -38,14 +38,14 @@ module DiscussionsHelper
 
   def solve_discussion_params_for(user)
     if user&.moderator_here?
-      {status: :pending_review, sort: :responses_count_asc, requires_moderator_response: true}
+      {status: :pending_review, sort: :responses_count_asc, requires_attention: true}
     else
       {status: :opened, sort: :responses_count_desc}
     end
   end
 
   def default_discussions_params
-    {status: :solved, sort: :upvotes_count_desc}
+    {status: :solved, sort: :created_at_desc, recent: true, limit: 15}
   end
 
   def user_avatar(user, image_class='')

data/app/helpers/profile_helper.rb

@@ -4,7 +4,7 @@ module ProfileHelper
   end
 
   def cancel_edit_profile_button
-    link_to t(:cancel), :user, class: 'btn btn-secondary' if current_user.profile_completed?
+    link_to t(:cancel), :user, class: 'btn btn-outline-complementary' if current_user.profile_completed?
   end
 
   def save_edit_profile_button(form)

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

@@ -17,30 +17,33 @@
     <% end %>
   <% end %>
 
-  <% if show_content?(@book) %>
-    <h2><%= t(:chapters) %></h2>
-  <% end %>
+  <% unless @book.chapters.empty? %>
+    <% if show_content?(@book) %>
+      <h2><%= t(:chapters) %></h2>
+    <% end %>
 
-  <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+    <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
 
-    <% next unless show_content?(it.topic) %>
+      <% next unless show_content?(it.topic) %>
 
-    <div class="chapter-container">
-      <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
-        <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
-        <div class="text-box" <%= 'aria-label=""' unless enabled %>>
-          <%= it.description_teaser_html %>
+      <div class="chapter-container">
+        <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
+          <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
+          <div class="text-box" <%= 'aria-label=""' unless enabled %>>
+            <%= it.description_teaser_html %>
+          </div>
         </div>
-      </div>
 
-      <% unless enabled %>
-        <div class="text-center mu-lock">
-          <i class="fas fa-lock fa-5x"></i>
-          <p><%= t :locked_content %></p>
-        </div>
-      <% end %>
-    </div>
+        <% unless enabled %>
+          <div class="text-center mu-lock">
+            <i class="fas fa-lock fa-5x"></i>
+            <p><%= t :locked_content %></p>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
+
   <% if current_user? && @exams.present? %>
     <h2><%= t(:exams) %></h2>
     <% @exams.each_with_index do |it, index| %>

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

@@ -20,7 +20,7 @@
   </div>
 </div>
 
-<% if @chapter.lessons.present? %>
+<% unless @chapter.lessons.empty? %>
   <% if @chapter.monolesson? %>
     <div> <%= render partial: 'guides/guide', locals: { subject: @monolesson } %> </div>
   <% else %>

data/app/views/discussions/_message.html.erb

@@ -3,7 +3,7 @@
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
         <%= linked_discussion_user_name user %>
-        <% if user.moderator_here? %>
+        <% if message.from_moderator? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
         <span class="message-date">

data/app/views/errors/forbidden.html.erb

@@ -8,12 +8,10 @@
         <%= t(:error_description, error: link_to_status_codes(403)).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(403, explanation).html_safe %>
+        <%= Organization.current.explain_error(error_code, explanation).html_safe %>
       </p>
       <p class="mu-error-contact-line mu-maybe">
         <%= t(:contact_administrator, link: mail_to_administrator).html_safe %>
       </p>
     </div>
 <% end %>
-
-

data/app/views/errors/gone.html.erb

@@ -8,8 +8,7 @@
         <%= t(:error_description, error: link_to_status_codes(410)).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(410, explanation).html_safe %>
+        <%= Organization.current.explain_error(error_code, explanation).html_safe %>
       </p>
     </div>
 <% end %>
-

data/app/views/errors/not_found.html.erb

@@ -8,7 +8,7 @@
         <%= t(:error_description, error: link_to_error_404).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(404, :not_found_explanation).html_safe %>
+        <%= Organization.current.explain_error(:not_found, :not_found_explanation).html_safe %>
       </p>
     </div>
 <% end %>

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

@@ -9,7 +9,7 @@
 <% @stats = @exercise.stats_for(current_user) %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
-  <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: { duration: @exercise.navigable_parent.time_left(current_user) } %>
 <% end %>
 
 <% unless @exercise.input_kids? %>

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

@@ -3,17 +3,21 @@
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
 <% if subject.timed? && @stats.started? && !current_user.teacher? %>
-  <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: { duration: subject.time_left(current_user) } %>
 <% end %>
 
 <%= yield if block_given? %>
 
-<h3>
-  <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
-</h3>
+<% unless @guide.exercises.empty? %>
 
-<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
+  <h3>
+    <%= t :exercises %>
+    <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
+  </h3>
+
+  <%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
+
+<% end %>
 
 <% if @stats&.done? %>
   <div class="text-box">

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

@@ -4,7 +4,7 @@
     <i class="timer timer-text text-center"><%= t :time_left %></i>
     <i id="timer" class="timer timer-text text-center"></i>
     <script>
-      mumuki.startTimer('<%= end_time&.iso8601 %>');
+      mumuki.startTimer(<%= duration %>);
     </script>
   </div>
 </div>

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

@@ -1,19 +1,23 @@
-<fieldset>
-  <div><%= form.label(t :first_name) %></div>
-  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :last_name) %></div>
-  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :gender) %></div>
-  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :birthdate) %></div>
-  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
-</fieldset>
+<div class="row">
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :first_name) %></div>
+    <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :last_name) %></div>
+    <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+</div>
+<div class="row">
+  <fieldset class="col-lg-4">
+    <div><%= form.label(t :birthdate) %></div>
+    <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-4 offset-lg-2">
+    <div><%= form.label(t :gender) %></div>
+    <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
+  </fieldset>
+</div>
 <fieldset>
   <div><%= form.label(t :email) %></div>
   <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>

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

@@ -1,22 +1,24 @@
 <%= form_for :user, url: user_path, :html => { id: 'mu-user-form', class: 'mu-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
-    <div class="mu-profile-actions d-none d-md-block">
-      <%= cancel_edit_profile_button %>
-      <%= save_edit_profile_button f %>
-    </div>
   </div>
   <div class="row mu-tab-body">
-    <div class="col-md-6 col-lg-4 mu-user-avatar-container">
+    <div class="col-md-6 col-lg-4 mu-user-avatar-container mb-3">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
       <button class="fas fa-pencil-alt fa-2x btn mu-edit-avatar" type="button" data-bs-toggle="modal" data-bs-target="#mu-avatar-picker" tabindex="0"></button>
     </div>
-    <div class="col-md-6 col-lg-8">
+    <div class="col-md-6 col-lg-8 mb-4">
+      <% unless current_user.profile_completed? %>
+        <div class="alert alert-info alert-dismissible fade show" role="alert">
+          <%= fa_icon 'info-circle', class: 'fa-lg me-2 align-middle', text: t(:please_fill_profile_data) %>
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+      <% end %>
       <%= render partial: 'profile_fields', locals: {form: f} %>
       <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
-  <div class="mu-profile-actions mobile d-block d-md-none">
+  <div class="mu-profile-actions">
     <%= cancel_edit_profile_button %>
     <%= save_edit_profile_button f %>
   </div>

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/es-CL.yml

@@ -291,7 +291,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

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

@@ -300,7 +300,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

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.18.1'
+    VERSION = '9.21.0'
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210929223144) do
+ActiveRecord::Schema.define(version: 20211020224011) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -387,6 +387,7 @@ ActiveRecord::Schema.define(version: 20210929223144) do
     t.datetime "deleted_at"
     t.bigint "deleted_by_id"
     t.bigint "assignment_id"
+    t.boolean "from_moderator"
     t.index ["approved_by_id"], name: "index_messages_on_approved_by_id"
     t.index ["assignment_id"], name: "index_messages_on_assignment_id"
     t.index ["deleted_by_id"], name: "index_messages_on_deleted_by_id"

data/spec/features/guides_flow_spec.rb

@@ -2,19 +2,28 @@ require 'spec_helper'
 
 feature 'Guides Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
-  let!(:exercises) { [
-    create(:exercise, name: 'Foo', guide: guide, number: 1, description: 'Description of foo'),
-    create(:exercise, name: 'Bar', guide: guide, number: 2),
-    create(:exercise, name: 'Baz', guide: guide, number: 4)
-  ] }
-  let(:guide) { create(:guide, name: 'awesomeGuide', description: 'An awesome guide', language: haskell, slug: 'foo/bar', authors: authors) }
+  let(:exercises) do
+    [
+      create(:exercise, name: 'Foo', number: 1, description: 'Description of foo'),
+      create(:exercise, name: 'Bar', number: 2),
+      create(:exercise, name: 'Baz', number: 4)
+    ]
+  end
+  let(:guide) do
+    create(:guide,
+      name: 'awesomeGuide',
+      description: 'An awesome guide',
+      language: haskell,
+      slug: 'foo/bar',
+      authors: authors,
+      exercises: exercises)
+  end
   let(:authors) { nil }
   let(:guide_not_in_path) { create(:guide) }
 
   let!(:lesson) { create(:lesson, guide: guide) }
   let!(:chapter) { create(:chapter, name: 'C1', lessons: [lesson]) }
 
-
   let!(:complement) { create(:complement, name: 'a complement', exercises: [
     create(:exercise, name: 'complementary exercise 1'),
     create(:exercise, name: 'complementary exercise 2')
@@ -48,6 +57,19 @@ feature 'Guides Flow', organization_workspace: :test do
   end
 
   context 'existent guide' do
+
+    context 'no exercises' do
+      let(:exercises) { []}
+
+      scenario 'visit lesson by id' do
+        visit "/guides/#{lesson.guide.id}"
+
+        expect(page).to have_text('awesomeGuide')
+        expect(page).to have_text('An awesome guide')
+        expect(page).to_not have_text('Exercises')
+      end
+    end
+
     context 'no authors' do
       let(:authors) { '' }
 

data/spec/features/immersive_redirection_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Immersive redirection Flow', organization_workspace: :test, subdomain_redirection_without_port: true do
   def create_guide(name)
-    create(:guide, name: name)
+    create(:guide, name: name, exercises: [create(:exercise)])
   end
 
   def create_immersive_organization(name, guides)

data/spec/features/not_found_public_flow_spec.rb

@@ -6,7 +6,14 @@ feature 'not found public on app' do
   let!(:some_orga) { create(:public_organization, name: 'someorga', profile: profile) }
 
   let(:profile) { Mumuki::Domain::Organization::Profile.parse json  }
-  let(:json) { { contact_email: 'some@email.com', locale: 'en', time_zone: 'Brasilia', errors_explanations: { 404 => 'Some explanation'} } }
+  let(:json) do
+     {
+      contact_email: 'some@email.com',
+      locale: 'en',
+      time_zone: 'Brasilia',
+      errors_explanations: { "not_found" => 'Some explanation'}
+    }
+  end
 
   scenario 'when route does not exist in explicit central' do
     set_subdomain_host! 'test'

data/spec/features/profile_flow_spec.rb

@@ -14,7 +14,7 @@ feature 'Profile Flow', organization_workspace: :test do
      'submission_id' => problem.assignments.last.submission_id,
      'organization' => 'test-organization',
      'message' => {
-       'sender' => 'test-email@gmail.com',
+       'sender' => create(:user).uid,
        'content' => 'a',
        'created_at' => '1/1/1'}} }
   let(:organization) { create(:organization, name: 'test-organization') }

data/spec/features/read_only_flow_spec.rb

@@ -14,14 +14,18 @@ feature 'Read Only Flow' do
   let(:exercise122) { create :exercise, name: 'Exercise 122' }
   let(:exercise211) { create :exercise, name: 'Exercise 211' }
   let(:exercise212) { create :exercise, name: 'Exercise 212' }
+  let(:exercise31) { create :exercise, name: 'Exercise 31' }
+  let(:exercise32) { create :exercise, name: 'Exercise 32' }
   let(:lesson11) { create :lesson, name: 'Lesson 11', exercises: [exercise111, exercise112] }
   let(:lesson12) { create :lesson, name: 'Lesson 12', exercises: [exercise121, exercise122] }
   let(:lesson21) { create :lesson, name: 'Lesson 21', exercises: [exercise211, exercise212] }
+  let(:complement3) { build :complement, name: 'Complement 3', exercises: [exercise31, exercise32] }
   let(:chapter1) { create :chapter, name: 'Chapter 1', lessons: [lesson11, lesson12] }
   let(:chapter2) { create :chapter, name: 'Chapter 2', lessons: [lesson21] }
-  let(:book) { create :book, chapters: [chapter1, chapter2] }
+  let(:book) { create :book, chapters: [chapter1, chapter2], complements: [complement3] }
 
   let(:assignment111) { build :assignment, submitter: user, organization: organization, exercise: exercise111, status: :failed }
+  let(:assignment31) { build :assignment, submitter: user, organization: organization, exercise: exercise31, status: :failed }
   let(:discussion111) { build :discussion, initiator: assignment111.user, item: assignment111.exercise, organization: assignment111.organization }
 
   let(:assignment112) { build :assignment, submitter: other_user, organization: organization, exercise: exercise112, status: :failed }
@@ -32,6 +36,7 @@ feature 'Read Only Flow' do
   before { set_current_user! user }
 
   before { assignment111.save! }
+  before { assignment31.save! }
   before { discussion111.save! }
   before { discussion112.save! }
 
@@ -72,6 +77,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -146,6 +157,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -222,6 +239,12 @@ feature 'Read Only Flow' do
           expect(page).not_to have_text('Exercise 112')
           expect(page).not_to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to_not have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -297,6 +320,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('You are not allowed to see this content')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('You are not allowed to see this content')
@@ -370,6 +397,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -434,6 +467,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('This path hasn\'t started yet')
         end
+        scenario 'show complemen' do
+          visit "/complemens/#{complement3.id}"
+          expect(page).to have_text('This path hasn\'t started yet')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('This path hasn\'t started yet')
@@ -470,20 +507,22 @@ feature 'Read Only Flow' do
 
       context 'and user is ex student of organization' do
         before { user.update! permissions: { ex_student: slug } }
-        scenario 'avatar dorpdown' do
+        scenario 'avatar dropdown' do
           visit "/"
           find('#profileDropdown').click
-          expect(page).not_to have_text('My account')
-          expect(page).not_to have_text('FAQs')
-          expect(page).not_to have_text('Classroom')
-          expect(page).not_to have_text('Solve other\'s doubts')
+          expect(page).to have_text('My account')
+          expect(page).to have_text('FAQs')
           expect(page).not_to have_text('My doubts')
+          expect(page).not_to have_text('Classroom')
           expect(page).not_to have_text('Bibliotheca')
+          expect(page).not_to have_text('Solve other\'s doubts')
           expect(page).to have_text('Sign Out')
         end
         scenario 'show book' do
           visit "/"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).not_to have_text('Chapter 1')
+          expect(page).not_to have_text('Chapter 2')
+          expect(page).not_to have_text('Practicing!')
         end
         scenario 'show chapter' do
           visit "/chapters/#{chapter1.id}"
@@ -493,6 +532,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('You are not allowed to see this content')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('You are not allowed to see this content')
@@ -503,27 +546,23 @@ feature 'Read Only Flow' do
         end
         scenario 'show profile' do
           visit "/user"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('My profile')
         end
         scenario 'show faqs' do
           visit "/faqs"
-          expect(page).to have_text('You are not allowed to see this content')
-        end
-        scenario 'show discussion' do
-          visit "/discussions"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('FAQs')
         end
         scenario 'show discussion in existent exercise' do
           visit "/exercises/#{exercise111.id}/discussions/#{discussion111.id}"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
         scenario 'show discussion in existent exercise' do
           visit "/exercises/#{exercise112.id}/discussions/#{discussion112.id}"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
         scenario 'new discussion' do
           visit "/exercises/#{exercise112.id}/discussions/new"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
       end
 
@@ -552,6 +591,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('You are not allowed to see this content')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('You are not allowed to see this content')
@@ -625,6 +668,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -699,6 +748,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).not_to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')
@@ -740,7 +795,7 @@ feature 'Read Only Flow' do
 
       context 'and user is ex student of organization' do
         before { user.update! permissions: { ex_student: slug } }
-        scenario 'avatar dorpdown' do
+        scenario 'avatar dorpdownz' do
           visit "/"
           find('#profileDropdown').click
           expect(page).to have_text('My account')
@@ -765,6 +820,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('You are not allowed to see this content')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('You are not allowed to see this content')
@@ -821,6 +880,10 @@ feature 'Read Only Flow' do
           visit "/lessons/#{lesson11.id}"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('You are not allowed to see this content')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('You are not allowed to see this content')
@@ -891,6 +954,12 @@ feature 'Read Only Flow' do
           expect(page).to have_text('Exercise 112')
           expect(page).to have_text('Continue this lesson!')
         end
+        scenario 'show complement' do
+          visit "/complements/#{complement3.id}"
+          expect(page).to have_text('Complement 3')
+          expect(page).to have_text('Exercise 31')
+          expect(page).to have_text('Exercise 32')
+        end
         scenario 'show exercise 111' do
           visit "/exercises/#{exercise111.id}"
           expect(page).to have_text('Exercise 111')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.18.1
+  version: 9.21.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.18.0
+        version: 9.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.18.0
+        version: 9.21.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -438,7 +438,6 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/upload.js
 - app/assets/javascripts/mumuki_laboratory/application/user.js
 - app/assets/stylesheets/mumuki_laboratory/application.scss
-- app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_errors.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_fonts.scss

data/app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss

@@ -1,3 +0,0 @@
-.alert {
-  margin-right: 15px;
-}