mumuki-laboratory 7.5.1 → 7.7.0

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/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: 20200527180729) do
+ActiveRecord::Schema.define(version: 20200731081757) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -117,6 +117,11 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.text "manual_evaluation_comment"
     t.integer "upvotes_count", default: 0
     t.bigint "organization_id"
+    t.integer "messages_count", default: 0
+    t.integer "validated_messages_count", default: 0
+    t.boolean "requires_moderator_response", default: true
+    t.string "last_moderator_access_by_id"
+    t.datetime "last_moderator_access_at"
     t.index ["initiator_id"], name: "index_discussions_on_initiator_id"
     t.index ["item_type", "item_id"], name: "index_discussions_on_item_type_and_item_id"
     t.index ["organization_id"], name: "index_discussions_on_organization_id"
@@ -143,7 +148,11 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.integer "max_problem_submissions"
     t.integer "max_choice_submissions"
     t.boolean "results_hidden_for_choices", default: false
+    t.bigint "course_id"
+    t.integer "passing_criterion_type", default: 0
+    t.integer "passing_criterion_value"
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
+    t.index ["course_id"], name: "index_exams_on_course_id"
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"
   end
@@ -288,6 +297,7 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.boolean "read", default: false
     t.integer "discussion_id"
     t.boolean "approved", default: false
+    t.boolean "not_actually_a_question", default: false
   end
 
   create_table "organizations", id: :serial, force: :cascade do |t|
@@ -298,6 +308,7 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.text "settings", default: "{}", null: false
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
+    t.integer "progressive_display_lookahead"
     t.index ["book_id"], name: "index_organizations_on_book_id"
     t.index ["name"], name: "index_organizations_on_name", unique: true
   end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/lib/organization_helpers_spec.rb

@@ -22,7 +22,10 @@ describe Mumukit::Platform::Organization do
         forum_enabled: true,
         report_issue_enabled: true,
         public: false,
+        gamification_enabled: true,
         immersive: false,
+        in_preparation_until: 1.minute.ago,
+        disabled_from: 1.minute.ago,
         login_methods: %w{facebook twitter google},
         login_provider: 'google',
         login_provider_settings: { token: '123' }
@@ -91,8 +94,11 @@ describe Mumukit::Platform::Organization do
         it { expect(subject.forum_enabled?).to be true }
         it { expect(subject.feedback_suggestions_enabled?).to be true }
         it { expect(subject.public?).to eq false }
+        it { expect(subject.gamification_enabled?).to be true }
         it { expect(subject.embeddable?).to eq false }
         it { expect(subject.immersive?).to eq false }
+        it { expect(subject.disabled?).to eq true }
+        it { expect(subject.in_preparation?).to eq false }
 
         it { expect(Mumuki::Domain::Organization::Settings.parse(nil)).to be_empty }
       end
@@ -100,11 +106,14 @@ describe Mumukit::Platform::Organization do
         let(:settings) { Mumuki::Domain::Organization::Settings.new(
                             public: true,
                             embeddable: true,
+                            in_preparation_until: 1.minute.since,
+                            disabled_from: 1.minute.since,
                             immersive: true,
                             raise_hand_enabled: false,
                             report_issue_enabled: false,
                             forum_enabled: false,
                             forum_discussions_minimal_role: 'teacher',
+                            gamification_enabled: false,
                             login_methods: [:google]) }
         let(:dump) { Mumuki::Domain::Organization::Settings.dump(settings) }
 
@@ -119,6 +128,9 @@ describe Mumukit::Platform::Organization do
         it { expect(subject.public?).to eq true }
         it { expect(subject.embeddable?).to eq true }
         it { expect(subject.immersive?).to eq true }
+        it { expect(subject.disabled?).to eq false }
+        it { expect(subject.gamification_enabled?).to eq false }
+        it { expect(subject.in_preparation?).to eq true }
 
         it { expect(Mumuki::Domain::Organization::Settings.load(nil)).to be_empty }
       end
@@ -216,7 +228,7 @@ describe Mumukit::Platform::Organization do
       } }
       it { expect(organization.to_resource_h).to json_eq resource_h }
     end
-    
+
     describe '#as_json' do
       context 'when settings has unsupported attributes' do
         before { organization.settings.instance_variable_set :@saraza, 5 }

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/lib/user_helpers_spec.rb

@@ -31,13 +31,13 @@ describe Mumuki::Domain::Helpers::User do
   end
 
   describe 'make_student_of!' do
-    before { user.make_student_of! organization.slug }
+    before { user.make_student_of! organization }
 
     it { expect(user.student?).to be true }
     it { expect(user.student? 'bar/_').to be false }
 
     it { expect(user.student_of? organization).to be true }
-    it { expect(user.student_of? struct(slug: 'bar/_')).to be false }
+    it { expect(user.student_of? 'bar/_').to be false }
   end
 
   describe 'to_resource_h' do
@@ -83,7 +83,7 @@ describe Mumuki::Domain::Helpers::User do
       before { Mumukit::Platform::Organization.switch! organization }
 
       context 'when in organization' do
-        before { user.make_student_of! organization.slug }
+        before { user.make_student_of! organization }
         it { expect(user.student_here?).to be true }
       end
 
@@ -111,7 +111,7 @@ describe Mumuki::Domain::Helpers::User do
         end
 
         context 'when in organization as student' do
-          before { user.make_student_of! organization.slug }
+          before { user.make_student_of! organization }
           it { expect(user.discusser_here?).to be true }
         end
       end
@@ -124,12 +124,12 @@ describe Mumuki::Domain::Helpers::User do
         end
 
         context 'when in organization as student' do
-          before { user.make_student_of! organization.slug }
+          before { user.make_student_of! organization }
           it { expect(user.discusser_here?).to be false }
         end
 
         context 'when in organization as teacher' do
-          before { user.make_teacher_of! organization.slug }
+          before { user.make_teacher_of! organization }
           it { expect(user.discusser_here?).to be true }
         end
       end
@@ -151,7 +151,7 @@ describe Mumuki::Domain::Helpers::User do
     end
 
     context 'with organization' do
-      before { user.make_student_of! organization.slug }
+      before { user.make_student_of! organization }
       before { expect(Mumukit::Platform.organization_class).to receive(:find_by_name!).and_return(organization)}
 
       it { expect(user.student_granted_organizations).to eq [organization] }

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/models/assignment_spec.rb

@@ -115,7 +115,7 @@ describe Assignment, organization_workspace: :test do
     end
 
     context 'should show only the first failed expectation result for kids problems' do
-      let(:problem) { create(:problem, layout: 'input_kids') }
+      let(:problem) { create(:problem, layout: 'input_primary') }
       it { expect(failed_submission.visible_expectation_results.size).to eq 1 }
     end
   end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/models/book_spec.rb

@@ -200,4 +200,125 @@ describe Book, organization_workspace: :test do
       it { expect(Chapter.count).to eq 1 }
     end
   end
+
+  describe 'enabled chapters' do
+    let(:exercise_1) { create(:exercise) }
+    let(:exercise_2) { create(:exercise) }
+    let(:exercise_3) { create(:exercise) }
+
+    let(:chapter_1) { build(:chapter, lessons: [create(:lesson, exercises: [exercise_1])]) }
+    let(:chapter_2) { build(:chapter, lessons: [create(:lesson, exercises: [exercise_2, exercise_3])]) }
+    let(:chapter_3) { build(:chapter, lessons: [create(:lesson)]) }
+
+    before { book.rebuild_chapters! [chapter_1, chapter_2, chapter_3] }
+
+    let(:organization) { Organization.current }
+    let(:workspace) { Mumuki::Domain::Workspace.new(user, organization) }
+
+    shared_examples_for 'full display' do
+      it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1, chapter_2, chapter_3] }
+      it { expect(book.chapter_visibilities_in(workspace)).to eq [[chapter_1, true], [chapter_2, true], [chapter_3, true]] }
+    end
+
+    context 'non-progressive display' do
+      context 'when annonymous user' do
+        let(:user) { nil }
+        it_behaves_like 'full display'
+      end
+
+      context 'when fresh user' do
+        let(:user) { create(:user) }
+        it_behaves_like 'full display'
+      end
+    end
+
+    context 'progressive display-1' do
+      before { organization.enable_progressive_display! }
+
+      context 'when annonymous user' do
+        let(:user) { nil }
+        it_behaves_like 'full display'
+      end
+
+      context 'when fresh user' do
+        let(:user) { create(:user) }
+        it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1] }
+      end
+
+      context 'when user with incomplete progress in first chapter' do
+        let(:user) { create(:user) }
+
+        before do
+          exercise_1.submit_solution!(user)
+        end
+
+        it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1] }
+        it { expect(book.chapter_visibilities_in(workspace)).to eq [[chapter_1, true], [chapter_2, false], [chapter_3, false]] }
+      end
+
+      context 'when user with full progress in first chapter' do
+        let(:user) { create(:user) }
+
+        before do
+          exercise_1.submit_solution!(user).passed!
+        end
+
+        it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1, chapter_2] }
+        it { expect(book.chapter_visibilities_in(workspace)).to eq [[chapter_1, true], [chapter_2, true], [chapter_3, false]] }
+      end
+
+      context 'when user with incomplete progress in second chapter' do
+        let(:user) { create(:user) }
+
+        before do
+          exercise_1.submit_solution!(user).passed!
+          exercise_2.submit_solution!(user).passed!
+        end
+
+        it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1, chapter_2] }
+        it { expect(book.chapter_visibilities_in(workspace)).to eq [[chapter_1, true], [chapter_2, true], [chapter_3, false]] }
+      end
+
+
+      context 'when user with incomplete progress in third chapter' do
+        let(:user) { create(:user) }
+
+        before do
+          exercise_1.submit_solution!(user).passed!
+          exercise_2.submit_solution!(user).passed!
+          exercise_3.submit_solution!(user).passed!
+        end
+
+        it_behaves_like 'full display'
+      end
+
+      context 'when teacher user' do
+        let(:user) { create(:user) }
+        before { user.make_teacher_of! organization }
+
+        it_behaves_like 'full display'
+      end
+    end
+
+    context 'progressive display-2' do
+      before { organization.enable_progressive_display! lookahead: 2 }
+
+      context 'when annonymous user' do
+        let(:user) { nil }
+        it_behaves_like 'full display'
+      end
+
+      context 'when fresh user' do
+        let(:user) { create(:user) }
+        it { expect(book.enabled_chapters_in(workspace)).to eq [chapter_1, chapter_2] }
+      end
+
+      context 'when teacher user' do
+        let(:user) { create(:user) }
+        before { user.make_teacher_of! organization }
+
+        it_behaves_like 'full display'
+      end
+    end
+  end
 end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/models/course_spec.rb

@@ -27,8 +27,8 @@ describe 'CourseChanged', organization_workspace: :test do
     end
 
     context 'when an invitation has been created' do
-      let(:expiration_date) { 2.days.since }
-      let!(:invitation) { course.invite! expiration_date  }
+      let(:expiration_date) { 2.days.since.beginning_of_day }
+      let!(:invitation) { course.invite! expiration_date }
 
       it { expect(invitation.expiration_date).to eq expiration_date }
       it { expect(invitation.code).to_not be nil }
@@ -41,7 +41,7 @@ describe 'CourseChanged', organization_workspace: :test do
       let(:old_expiration) { 1.day.since.beginning_of_day }
 
       before { course.invite! old_expiration }
-      let!(:invitation) { course.invite! 2.days.since  }
+      let!(:invitation) { course.invite! 2.days.since }
 
       # This behaviour is debatable, but it is the current expected behaviour
       it { expect(invitation.expiration_date).to eq old_expiration }
@@ -54,8 +54,8 @@ describe 'CourseChanged', organization_workspace: :test do
     context 'when an invitation has been created and then re-created after expiration' do
       before { course.invite! 1.day.ago }
 
-      let(:new_expiration) { 2.days.since }
-      let!(:invitation) { course.invite! new_expiration  }
+      let(:new_expiration) { 2.days.since.beginning_of_day }
+      let!(:invitation) { course.invite! new_expiration }
 
       it { expect(invitation.expiration_date).to eq new_expiration }
       it { expect(invitation.code).to_not be nil }

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/spec/models/discussion_spec.rb

@@ -17,53 +17,53 @@ describe Discussion, organization_workspace: :test do
     it { expect(discussion.item).to eq problem }
     it { expect(initiator.subscribed_to? discussion).to be true }
     it { expect(discussion.status).to eq :opened }
-    it { expect(discussion.reachable_statuses_for initiator).to eq [:closed] }
+    it { expect(discussion.reachable_statuses_for initiator).to eq [] }
     it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
     it { expect(discussion.reachable_statuses_for student).to eq [] }
     it { expect(discussion.commentable_by? student).to be true }
     it { expect(discussion.commentable_by? moderator).to be true }
 
     describe 'initiator sends a message' do
-      before { discussion.submit_message!({content: 'I forgot to say this'}, initiator)  }
+      before { discussion.submit_message!({content: 'I forgot to say this'}, initiator) }
 
       it { expect(discussion.has_responses?).to be false }
       it { expect(discussion.messages.first.content).to eq 'I forgot to say this' }
       it { expect(initiator.unread_discussions).to eq [] }
-      it { expect(discussion.reachable_statuses_for initiator).to eq [:closed] }
+      it { expect(discussion.reachable_statuses_for initiator).to eq [] }
       it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
       it { expect(discussion.reachable_statuses_for student).to eq [] }
 
-      describe 'and closes the discussion' do
+      describe 'and closes the discussion then status can not be updated' do
         before { discussion.update_status!(:closed, initiator) }
 
-        it { expect(discussion.status).to eq :closed }
+        it { expect(discussion.status).to eq :opened }
         it { expect(discussion.reachable_statuses_for initiator).to eq [] }
-        it { expect(discussion.reachable_statuses_for moderator).to eq [:opened, :solved] }
+        it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
         it { expect(discussion.reachable_statuses_for student).to eq [] }
-        it { expect(discussion.commentable_by? student).to be false }
+        it { expect(discussion.commentable_by? student).to be true }
         it { expect(discussion.commentable_by? moderator).to be true }
       end
     end
 
     describe 'receive message from helper' do
-      before { discussion.submit_message!({content: 'You should do this'}, student)  }
+      before { discussion.submit_message!({content: 'You should do this'}, student) }
 
       it { expect(discussion.has_responses?).to be true }
       it { expect(initiator.unread_discussions).to include discussion }
       it { expect(discussion.messages.first.content).to eq 'You should do this' }
-      it { expect(discussion.reachable_statuses_for initiator).to eq [:pending_review] }
+      it { expect(discussion.reachable_statuses_for initiator).to eq [] }
       it { expect(discussion.reachable_statuses_for moderator).to eq [:closed, :solved] }
       it { expect(discussion.reachable_statuses_for student).to eq [] }
       it { expect(student.subscribed_to? discussion).to be true }
 
-      describe 'gets updated to pending_review by initiator' do
+      describe 'gets updated to pending_review by initiator but he can not do it' do
         before { discussion.update_status!(:pending_review, initiator) }
 
-        it { expect(discussion.status).to eq :pending_review }
+        it { expect(discussion.status).to eq :opened }
         it { expect(discussion.reachable_statuses_for initiator).to eq [] }
-        it { expect(discussion.reachable_statuses_for moderator).to eq [:opened, :closed, :solved] }
+        it { expect(discussion.reachable_statuses_for moderator).to eq [:closed, :solved] }
         it { expect(discussion.reachable_statuses_for student).to eq [] }
-        it { expect(discussion.commentable_by? student).to be false }
+        it { expect(discussion.commentable_by? student).to be true }
         it { expect(discussion.commentable_by? moderator).to be true }
       end
 
@@ -138,7 +138,7 @@ describe Discussion, organization_workspace: :test do
     let(:exercise) { create(:problem) }
 
     let!(:public_discussions) { [:opened, :solved].map { |it| exercise.discuss!(initiator, {status: it, title: 'A disc'}) } }
-    let!(:private_discussions ) { [:pending_review, :closed].map { |it| exercise.discuss!(initiator, {status: it, title: 'A disc'}) } }
+    let!(:private_discussions) { [:pending_review, :closed].map { |it| exercise.discuss!(initiator, {status: it, title: 'A disc'}) } }
     let!(:other_discussion) { exercise.discuss!(other_user, {status: :closed, title: 'A disc'}) }
 
     context 'as student' do
@@ -166,11 +166,99 @@ describe Discussion, organization_workspace: :test do
     let(:other_user) { create(:user) }
     let(:problem) { create(:problem) }
     let(:assignment) { problem.submit_solution! user }
-    let(:discussion) { problem.discuss!(user, {title: 'A discussion'})}
+    let(:discussion) { problem.discuss!(user, {title: 'A discussion'}) }
 
     before { discussion.submit_message!({content: 'You should do this'}, user) }
     before { problem.submit_solution! other_user }
 
     it { expect(discussion.messages.count).to eq 1 }
   end
+
+  describe '#update_counters_cache!' do
+    let(:initiator) { create(:user) }
+    let(:other_user) { create(:user) }
+    let(:problem) { create(:problem) }
+    let(:moderator) { create(:user, permissions: {moderator: 'test/*'}) }
+    let(:assignment) { problem.submit_solution! initiator }
+    let(:discussion) { problem.discuss!(initiator, {title: 'A discussion'}) }
+
+    context 'when discussion is created' do
+      it { expect(discussion.requires_moderator_response?).to be true }
+      it { expect(discussion.validated_messages_count).to eq 0 }
+      it { expect(discussion.messages_count).to eq 0 }
+    end
+
+    context 'when moderator responds' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be false }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 1 }
+    end
+
+    context 'when moderator and other user responds' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'same question'}, other_user) }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be false }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 2 }
+    end
+
+    context 'when moderator and initiator responds' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'need more help'}, initiator) }
+      before { discussion.submit_message!({content: 'same question'}, other_user) }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be true }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 3 }
+    end
+
+    context 'when moderator and initiator responds but the latter is not a question' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'need more help'}, initiator) }
+      before { discussion.messages.last.update! not_actually_a_question: true }
+      before { discussion.submit_message!({content: 'same question'}, other_user) }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be false }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 3 }
+    end
+
+    context 'when moderator and initiator responds twice' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'need more help'}, initiator) }
+      before { discussion.messages.last.update! not_actually_a_question: true }
+      before { discussion.submit_message!({content: 'same question'}, initiator) }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be true }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 3 }
+    end
+
+    context 'when message gets deleted' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'another question'}, initiator) }
+      before { discussion.messages.last.destroy! }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be false }
+      it { expect(discussion.reload.validated_messages_count).to eq 1 }
+      it { expect(discussion.reload.messages_count).to eq 1 }
+    end
+
+    context 'long discussion' do
+      before { discussion.submit_message!({content: 'it is ok'}, moderator) }
+      before { discussion.submit_message!({content: 'need more help'}, initiator) }
+      before { discussion.messages.last.update! not_actually_a_question: true }
+      before { discussion.submit_message!({content: 'same question'}, initiator) }
+      before { discussion.submit_message!({content: 'do it like this'}, moderator) }
+      before { discussion.submit_message!({content: 'thanks'}, initiator) }
+      before { discussion.messages.last.update! not_actually_a_question: true }
+
+      it { expect(discussion.reload.requires_moderator_response?).to be false }
+      it { expect(discussion.reload.validated_messages_count).to eq 2 }
+      it { expect(discussion.reload.messages_count).to eq 5 }
+    end
+  end
 end