mumuki-laboratory 7.6.1 → 7.7.3

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: 20200608132959) 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: 20200608132959) 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: 20200608132959) 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: 20200608132959) 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|
@@ -375,6 +385,7 @@ ActiveRecord::Schema.define(version: 20200608132959) do
     t.string "verified_last_name"
     t.bigint "avatar_id"
     t.datetime "disabled_at"
+    t.boolean "trusted_for_forum"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"
     t.index ["uid"], name: "index_users_on_uid", unique: true

data/spec/features/discussion_flow_spec.rb

@@ -0,0 +1,190 @@
+require 'spec_helper'
+
+feature 'Discussion Flow', organization_workspace: :test do
+
+  ## =============
+  ## Users
+  ## =============
+
+  let(:student) { create(:user, permissions: {student: 'test/*:other/*:empty/*'}) }
+  let(:another_student) { create(:user, permissions: {student: 'test/*:other/*:empty/*'}) }
+  let(:moderator) { create(:user, permissions: {moderator: 'test/*:other/*:empty/*', student: 'test/*:other/*:empty/*'}) }
+
+  ## =================
+  ## Organizations
+  ## =================
+
+  let(:test_organization) { Organization.locate! 'test' }
+  let(:other_organization) { create(:organization, name: 'other') }
+  let!(:empty_organization) { create(:organization, name: 'empty') }
+
+  ## ================================
+  ## Content for test_organization
+  ## ================================
+
+  let(:problem_1) { create(:problem) }
+  let(:problem_2) { create(:problem) }
+  let(:problem_3) { create(:problem) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [create(:lesson, exercises: [ problem_1, problem_2, problem_3])])
+  }
+
+  ## =====================================
+  ## Discussions for test_organization
+  ## =====================================
+
+  let(:problem_2_discussions) { create_list(:discussion, 5, initiator: another_student, item: problem_2, organization: test_organization) }
+  let(:problem_3_discussions) { create_list(:discussion, 5, initiator: student, item: problem_2, organization: test_organization) }
+  let!(:test_organization_discussions) { problem_2_discussions + problem_3_discussions }
+
+  ## ===================================
+  ## Content for other_organization
+  ## ===================================
+
+  let(:other_problem) { create(:problem) }
+  let!(:other_chapter) {
+    create(:chapter, book: other_organization.book, lessons: [create(:lesson, exercises: [other_problem])])
+  }
+
+  ## =====================================
+  ## Discussions for other_organization
+  ## =====================================
+
+  let(:other_problem_discussions) { create_list(:discussion, 5, initiator: student, item: problem_2, organization: other_organization) }
+  let!(:other_organization_discussions) { other_problem_discussions }
+
+  before { reindex_current_organization! }
+  before { reindex_organization! other_organization }
+  before { reindex_organization! empty_organization }
+
+  shared_examples 'no forum access' do
+    scenario 'has no forum access' do
+      visit current_path
+      expect(page).to have_text('You may have mistyped the address or the page may have moved')
+    end
+  end
+
+  context 'exercise discussions' do
+    let(:current_path) { "/exercises/#{problem_1.id}/discussions" }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged user' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        scenario 'empty discussion list for problem 1' do
+          visit "/exercises/#{problem_1.id}/discussions"
+          expect(page).to have_text(problem_1.name)
+          expect(page).to have_text('It seems there isn\'t any question yet.')
+        end
+
+        scenario 'discussion list for problem 2' do
+          visit "/exercises/#{problem_2.id}/discussions"
+          expect(page).to have_text(problem_2.name)
+          problem_2_discussions.each do |discussion|
+            expect(page).to have_text(discussion.description)
+          end
+          expect(page).to have_text('Didn\'t find what you were looking for?')
+        end
+      end
+    end
+  end
+
+  context 'book discussions' do
+    let(:current_path) { '/discussions' }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged user' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        context 'in empty organization' do
+          before { empty_organization.update! forum_enabled: true }
+          before { set_subdomain_host! 'empty' }
+          after { set_subdomain_host! 'test' }
+
+          scenario 'empty discussion list for book without discussions' do
+            visit current_path
+            expect(page).to have_text(empty_organization.book.name)
+            expect(page).to have_text('It seems there isn\'t any question yet.')
+          end
+
+        end
+
+        scenario 'discussion list for book with discussions' do
+          visit current_path
+          expect(page).to have_text(test_organization.book.name)
+          test_organization_discussions.each do |discussion|
+            expect(page).to have_text(discussion.description)
+          end
+          other_organization_discussions.each do |discussion|
+            expect(page).not_to have_text(discussion.description)
+          end
+          expect(page).not_to have_text('Didn\'t find what you were looking for?')
+          expect(page).not_to have_text('It seems there isn\'t any question yet.')
+        end
+      end
+    end
+  end
+
+  context 'exercise discussion' do
+    let(:current_path) { "/exercises/#{problem_2.id}/discussions/#{problem_2_discussions.first.id}" }
+    before { test_organization.switch! }
+
+    context 'with no current user' do
+      it_behaves_like 'no forum access'
+    end
+
+    context 'with logged student' do
+      before { set_current_user! student }
+
+      context 'but no forum enabled' do
+        it_behaves_like 'no forum access'
+      end
+
+      context 'and forum enabled' do
+        before { Organization.current.update! forum_enabled: true }
+
+        scenario 'newly created discussion' do
+          visit current_path
+          expect(page).to have_text(problem_2.name)
+          expect(page).to have_text('Open')
+          expect(page).to have_text('Messages')
+          expect(page).not_to have_xpath("//div[@class='discussion-actions']")
+        end
+
+        context 'for moderator' do
+          before { set_current_user! moderator }
+
+          scenario 'newly created discussion' do
+            visit current_path
+            expect(page).to have_text(problem_2.name)
+            expect(page).to have_text('Open')
+            expect(page).to have_text('Messages')
+            expect(page).to have_xpath("//div[@class='discussion-actions']")
+          end
+        end
+      end
+    end
+  end
+
+end

data/spec/features/exercise_flow_spec.rb

@@ -17,7 +17,7 @@ feature 'Exercise Flow', organization_workspace: :test do
   let(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }
   let!(:exercise_not_in_path) { create :exercise }
-  let(:kids_problem) { build(:problem, name: 'Kids prob', description: 'Description of kids prob', layout: :input_kids, hint: 'lele', language: gobstones) }
+  let(:kids_problem) { build(:problem, name: 'Kids prob', description: 'Description of kids prob', layout: :input_primary, hint: 'lele', language: gobstones) }
 
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [

data/spec/features/menu_bar_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 feature 'menu bar' do
-  let(:chapter) { create(:chapter, lessons: [create(:lesson)]) }
+  let(:lesson) { create(:lesson, exercises: create_list(:exercise, 3))}
+  let(:chapter) { create(:chapter, lessons: [lesson]) }
   let(:book) { create(:book, chapters: [chapter], name: 'private', slug: 'mumuki/mumuki-the-private-book') }
   let(:private_organization) { create(:organization, name: 'private', book: book) }
 
@@ -32,6 +33,8 @@ feature 'menu bar' do
         expect(page).not_to have_text('Profile')
         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).not_to have_text('My doubts')
       end
     end
   end
@@ -52,15 +55,91 @@ feature 'menu bar' do
       expect(page).to have_text('Profile')
       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).not_to have_text('My doubts')
     end
 
-    scenario 'student should only see profile' do
-      set_current_user! visitor
+    context 'student with no discussions should' do
+      scenario 'only see profile if forum is not enabled' do
+        set_current_user! student
 
-      visit '/'
-      expect(page).to have_text('Profile')
-      expect(page).not_to have_text('Classroom')
-      expect(page).not_to have_text('Bibliotheca')
+        visit '/'
+        expect(page).to have_text('Profile')
+        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).not_to have_text('My doubts')
+      end
+
+      scenario 'see profile and solve_other_doubts links if forum is enabled' do
+        set_current_user! student
+        private_organization.update! forum_enabled: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).not_to have_text('My doubts')
+      end
+    end
+
+    context 'student with discussions should' do
+      let(:discussion) { create(:discussion, item: lesson.exercises.last, initiator: student)}
+
+      scenario 'only see profile if forum is not enabled' do
+        set_current_user! student
+        student.subscribe_to! discussion
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        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).not_to have_text('My doubts')
+      end
+
+      scenario 'see all discussions links if forum is enabled' do
+        set_current_user! student
+        private_organization.update! forum_enabled: true
+        student.subscribe_to! discussion
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).to have_text('My doubts')
+      end
+
+      scenario 'only see profile if forum is enabled in a forum_only_for_trusted organization' do
+        set_current_user! student
+        student.subscribe_to! discussion
+        private_organization.update! forum_enabled: true
+        private_organization.update! forum_only_for_trusted: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        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).not_to have_text('My doubts')
+      end
+
+      scenario 'see all discussions links if forum is enabled in a forum_only_for_trusted organization but it is trusted' do
+        student.update! trusted_for_forum: true
+        set_current_user! student
+        student.subscribe_to! discussion
+        private_organization.update! forum_enabled: true
+        private_organization.update! forum_only_for_trusted: true
+
+        visit '/'
+        expect(page).to have_text('Profile')
+        expect(page).not_to have_text('Classroom')
+        expect(page).not_to have_text('Bibliotheca')
+        expect(page).to have_text('Solve other\'s doubts')
+        expect(page).to have_text('My doubts')
+      end
     end
 
     scenario 'teacher should see profile and classroom' do
@@ -71,6 +150,8 @@ feature 'menu bar' do
       expect(page).to have_text('Profile')
       expect(page).to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
+      expect(page).not_to have_text('Solve other\'s doubts')
+      expect(page).not_to have_text('My doubts')
     end
 
     scenario 'writer should see profile and bibliotheca' do

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -91,7 +91,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
         expect(breadcrumb).to include('my lesson')
         expect(breadcrumb).to include('my exercise')
         expect(breadcrumb).to include('discussions')
-        expect(breadcrumb).to include(discussion.title)
+        expect(breadcrumb).to include(discussion.item.navigable_name)
         expect(breadcrumb).to be_html_safe
       end
     end

data/spec/javascripts/bridge-spec.js

@@ -0,0 +1,5 @@
+describe('bridge', () => {
+  it('can create bridge', () => {
+    expect(new mumuki.bridge.Laboratory()).not.toBe(null);
+  })
+})

data/spec/javascripts/csrf-token-spec.js

@@ -0,0 +1,7 @@
+describe('csrf token', () => {
+  it('can create token', () => {
+    expect(new mumuki.CsrfToken()).not.toBe(null);
+  })
+})
+
+

data/spec/javascripts/elipsis-spec.js

@@ -0,0 +1,25 @@
+describe('elipsis', () => {
+  it('does nothing when no elipsis', () => {
+    expect(mumuki.elipsis('hello')).toEqual('hello');
+  })
+
+  it('replaces student elipsis', () => {
+    expect(mumuki.elipsis(`function longitud(unString) {
+      /*<elipsis-for-student@*/
+      return unString.length;
+      /*@elipsis-for-student>*/
+    }`)).toEqual(`function longitud(unString) {
+      /* ... */
+    }`)
+  });
+
+  it('replaces student hidden', () => {
+    expect(mumuki.elipsis(`function longitud(unString) {
+      /*<hidden-for-student@*/
+      return unString.length;
+      /*@hidden-for-student>*/
+    }`)).toEqual(`function longitud(unString) {
+      /**/
+    }`)
+  });
+})

data/spec/javascripts/results-renderers-spec.js

@@ -0,0 +1,17 @@
+describe('results renderers', () => {
+  it('can compute class for status', () => {
+    expect(mumuki.renderers.classForStatus('passed')).toEqual('success');
+  })
+
+  it('can compute icon for status', () => {
+    expect(mumuki.renderers.iconForStatus('pending')).toEqual('fa-circle');
+  })
+
+  it('can compute progress list item for status', () => {
+    expect(mumuki.renderers.progressListItemClassForStatus('passed_with_warnings')).toEqual('progress-list-item text-center warning ');
+  })
+
+  it('can compute progress list item for status when active', () => {
+    expect(mumuki.renderers.progressListItemClassForStatus('failed', true)).toEqual('progress-list-item text-center danger active');
+  })
+})

data/spec/javascripts/spec-helper.js

@@ -0,0 +1,30 @@
+// Teaspoon includes some support files, but you can use anything from your own support path too.
+// require support/jasmine-jquery-1.7.0
+// require support/jasmine-jquery-2.0.0
+// require support/jasmine-jquery-2.1.0
+// require support/sinon
+//
+// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+// Use this polyfill to avoid the confusion.
+//
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the spec that tests them.
+//=require mumuki_laboratory/application
+//
+// Deferring execution
+// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+// Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
+//
+// Teaspoon.defer = true
+// setTimeout(Teaspoon.execute, 1000)
+//
+// Matching files
+// By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
+// spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
+// configuration in teaspoon_env.rb
+//
+// Manifest
+// If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
+// the configuration and use this file as a manifest.
+//
+// For more information: http://github.com/modeset/teaspoon