mumuki-laboratory 9.19.0 → 9.22.0

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.19.0'
+    VERSION = '9.22.0'
   end
 end

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/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,9 +387,12 @@ ActiveRecord::Schema.define(version: 20210929223144) do
     t.datetime "deleted_at"
     t.bigint "deleted_by_id"
     t.bigint "assignment_id"
+    t.bigint "sender_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"
+    t.index ["sender_id"], name: "index_messages_on_sender_id"
   end
 
   create_table "notifications", force: :cascade do |t|

data/spec/features/discussion_flow_spec.rb

@@ -162,8 +162,8 @@ feature 'Discussion Flow', organization_workspace: :test do
       end
 
       context 'and forum enabled' do
-        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) }
+        let!(:problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student) }
+        let!(:another_problem_2_discussion_message) { create(:message, discussion: problem_2_discussions.first, sender: another_student) }
         before do
           Organization.current.update! forum_enabled: true
           another_problem_2_discussion_message.soft_delete! :inappropriate_content, moderator

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') }
@@ -104,6 +104,8 @@ feature 'Profile Flow', organization_workspace: :test do
     end
 
     context 'with messages' do
+      before { create :user, uid: 'test-email@gmail.com' }
+
       scenario 'visit messages' do
         Organization.find_by_name('test').switch!
         problem.submit_solution! user, {content: 'something'}

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')
@@ -495,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')
@@ -550,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')
@@ -623,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')
@@ -697,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')
@@ -763,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')
@@ -819,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')
@@ -889,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')