mumuki-laboratory 5.5.0 → 5.6.0

data/lib/mumuki/laboratory/status/discussion/opened.rb

@@ -0,0 +1,27 @@
+module Mumuki::Laboratory::Status::Discussion::Opened
+  extend Mumuki::Laboratory::Status::Discussion
+
+  def self.opened?
+    true
+  end
+
+  def self.reachable_statuses_for_initiator(discussion)
+    if discussion.has_responses?
+      [Mumuki::Laboratory::Status::Discussion::PendingReview]
+    else
+      [Mumuki::Laboratory::Status::Discussion::Closed]
+    end
+  end
+
+  def self.reachable_statuses_for_moderator(_)
+    [Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
+  end
+
+  def self.iconize
+    {class: :warning, type: 'question-circle'}
+  end
+
+  def self.should_be_shown?(*)
+    true
+  end
+end

data/lib/mumuki/laboratory/status/discussion/pending_review.rb

@@ -0,0 +1,15 @@
+module Mumuki::Laboratory::Status::Discussion::PendingReview
+  extend Mumuki::Laboratory::Status::Discussion
+
+  def self.pending_review?
+    true
+  end
+
+  def self.reachable_statuses_for_moderator(*)
+    [Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
+  end
+
+  def self.iconize
+    {class: :info, type: 'hourglass'}
+  end
+end

data/lib/mumuki/laboratory/status/discussion/solved.rb

@@ -0,0 +1,19 @@
+module Mumuki::Laboratory::Status::Discussion::Solved
+  extend Mumuki::Laboratory::Status::Discussion
+
+  def self.solved?
+    true
+  end
+
+  def self.reachable_statuses_for_moderator(*)
+    [Mumuki::Laboratory::Status::Discussion::Closed]
+  end
+
+  def self.iconize
+    {class: :success, type: 'check-circle'}
+  end
+
+  def self.should_be_shown?(*)
+    true
+  end
+end

data/lib/mumuki/laboratory/status/submission/aborted.rb

@@ -0,0 +1,11 @@
+module Mumuki::Laboratory::Status::Submission::Aborted
+  extend Mumuki::Laboratory::Status::Submission
+
+  def self.group
+    Mumuki::Laboratory::Status::Submission::Failed
+  end
+
+  def aborted?
+    true
+  end
+end

data/lib/mumuki/laboratory/status/submission/errored.rb

@@ -0,0 +1,15 @@
+module Mumuki::Laboratory::Status::Submission::Errored
+  extend Mumuki::Laboratory::Status::Submission
+
+  def self.errored?
+    true
+  end
+
+  def self.group
+    Mumuki::Laboratory::Status::Submission::Failed
+  end
+
+  def self.iconize
+    {class: :broken, type: 'minus-circle'}
+  end
+end

data/lib/mumuki/laboratory/status/{failed.rb → submission/failed.rb}

@@ -1,5 +1,5 @@
-module Mumuki::Laboratory::Status::Failed
-  extend Mumuki::Laboratory::Status::Base
+module Mumuki::Laboratory::Status::Submission::Failed
+  extend Mumuki::Laboratory::Status::Submission
 
   def self.failed?
     true

data/lib/mumuki/laboratory/status/submission/manual_evaluation_pending.rb

@@ -0,0 +1,15 @@
+module Mumuki::Laboratory::Status::Submission::ManualEvaluationPending
+  extend Mumuki::Laboratory::Status::Submission
+
+  def self.passed?
+    true
+  end
+
+  def self.group
+    Mumuki::Laboratory::Status::Submission::Passed
+  end
+
+  def self.iconize
+    {class: :info, type: 'clock-o'}
+  end
+end

data/lib/mumuki/laboratory/status/{passed.rb → submission/passed.rb}

@@ -1,5 +1,5 @@
-module Mumuki::Laboratory::Status::Passed
-  extend Mumuki::Laboratory::Status::Base
+module Mumuki::Laboratory::Status::Submission::Passed
+  extend Mumuki::Laboratory::Status::Submission
 
   def self.passed?
     true

data/lib/mumuki/laboratory/status/{passed_with_warnings.rb → submission/passed_with_warnings.rb}

@@ -1,5 +1,5 @@
-module Mumuki::Laboratory::Status::PassedWithWarnings
-  extend Mumuki::Laboratory::Status::Base
+module Mumuki::Laboratory::Status::Submission::PassedWithWarnings
+  extend Mumuki::Laboratory::Status::Submission
 
   def self.passed?
     true

data/lib/mumuki/laboratory/status/submission/pending.rb

@@ -0,0 +1,11 @@
+module Mumuki::Laboratory::Status::Submission::Pending
+  extend Mumuki::Laboratory::Status::Submission
+
+  def self.group
+    Mumuki::Laboratory::Status::Submission::Unknown
+  end
+
+  def self.iconize
+    {class: :info, type: 'clock-o'}
+  end
+end

data/lib/mumuki/laboratory/status/submission/running.rb

@@ -0,0 +1,11 @@
+module Mumuki::Laboratory::Status::Submission::Running
+  extend Mumuki::Laboratory::Status::Submission
+
+  def self.group
+    Mumuki::Laboratory::Status::Submission::Unknown
+  end
+
+  def self.iconize
+    {class: :info, type: :circle}
+  end
+end

data/lib/mumuki/laboratory/status/submission/submission.rb

@@ -0,0 +1,49 @@
+module Mumuki::Laboratory::Status::Submission
+  include Mumuki::Laboratory::Status
+end
+
+require_relative './unknown'
+require_relative './pending'
+require_relative './running'
+require_relative './passed'
+require_relative './failed'
+require_relative './errored'
+require_relative './aborted'
+require_relative './passed_with_warnings'
+require_relative './manual_evaluation_pending'
+
+module Mumuki::Laboratory::Status::Submission
+  STATUSES = [Pending, Running, Passed, Failed, Errored, Aborted, PassedWithWarnings, ManualEvaluationPending]
+
+  def group
+    self
+  end
+
+  def passed?
+    false
+  end
+
+  def failed?
+    false
+  end
+
+  def errored?
+    false
+  end
+
+  def aborted?
+    false
+  end
+
+  def should_retry?
+    true
+  end
+
+  def iconize
+    group.iconize
+  end
+
+  def as_json(_options={})
+    to_s
+  end
+end

data/lib/mumuki/laboratory/status/{unknown.rb → submission/unknown.rb}

@@ -1,5 +1,5 @@
-module Mumuki::Laboratory::Status::Unknown
-  extend Mumuki::Laboratory::Status::Base
+module Mumuki::Laboratory::Status::Submission::Unknown
+  extend Mumuki::Laboratory::Status::Submission
 
   def self.to_i
     raise 'unknown status'

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.5.0'
+    VERSION = '5.6.0'
   end
 end

data/spec/controllers/chapters_controller_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe ChaptersController, type: :controller, organization_workspace: :test do
+  describe 'when chapter does not exist' do
+    before { get :show, params: {id: 0} }
+
+    it { expect(response.status).to eq 404 }
+  end
+
+  describe 'when chapter exists' do
+    let!(:chapter) { create(:chapter) }
+
+    before { get :show, params: {id: chapter.id} }
+
+    it { expect(response.status).to eq 200 }
+  end
+end

data/spec/controllers/discussions_controller_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe DiscussionsController, organization_workspace: :test do
+  let(:user) { create(:user) }
+  let(:exercise) { create(:exercise) }
+  let(:exercise_params) { {debatable_class: 'Exercise', exercise_id: exercise.id} }
+
+  before { set_current_user! user }
+
+  describe 'post' do
+    before { allow_any_instance_of(DiscussionsController).to receive(:discussion_params).and_return title: 'A title' }
+    before { post :create, params: exercise_params }
+
+    it { expect(response.status).to eq 302 }
+    it { expect(exercise.discussions.size).to eq 1 }
+    it { expect(user.discussions.size).to eq 1 }
+    it { expect(user.watched_discussions.size).to eq 1 }
+  end
+end

data/spec/dummy/config/environments/development.rb

@@ -52,6 +52,4 @@ Rails.application.configure do
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-
-  config.status_rendering_verbosity = :verbose
 end

data/spec/dummy/config/environments/test.rb

@@ -42,8 +42,6 @@ Rails.application.configure do
 
   config.i18n.default_locale = :en
 
-  config.status_rendering_verbosity = :standard
-
   OmniAuth.config.test_mode = true
   OmniAuth.config.mock_auth[:developer] =
     OmniAuth::AuthHash.new provider: 'developer',

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: 20180611190239) do
+ActiveRecord::Schema.define(version: 20180704150839) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -27,7 +27,7 @@ ActiveRecord::Schema.define(version: 20180611190239) do
   create_table "assignments", id: :serial, force: :cascade do |t|
     t.text "solution"
     t.integer "exercise_id"
-    t.integer "status", default: 0
+    t.integer "submission_status", default: 0
     t.text "result"
     t.integer "submitter_id"
     t.text "expectation_results"
@@ -86,6 +86,30 @@ ActiveRecord::Schema.define(version: 20180611190239) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "discussions", force: :cascade do |t|
+    t.integer "status", default: 0
+    t.string "title"
+    t.text "description"
+    t.bigint "initiator_id"
+    t.string "item_type"
+    t.bigint "item_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.text "solution"
+    t.integer "submission_status", default: 0
+    t.text "result"
+    t.text "expectation_results"
+    t.text "feedback"
+    t.text "test_results"
+    t.string "submission_id"
+    t.string "queries", default: [], array: true
+    t.text "query_results"
+    t.text "manual_evaluation_comment"
+    t.integer "upvotes_count"
+    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"
+  end
+
   create_table "exam_authorizations", force: :cascade do |t|
     t.integer "exam_id"
     t.integer "user_id"
@@ -210,6 +234,7 @@ ActiveRecord::Schema.define(version: 20180611190239) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean "read", default: false
+    t.integer "discussion_id"
   end
 
   create_table "organizations", id: :serial, force: :cascade do |t|
@@ -232,6 +257,14 @@ ActiveRecord::Schema.define(version: 20180611190239) do
     t.index ["language_id"], name: "index_paths_on_language_id"
   end
 
+  create_table "subscriptions", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "discussion_id"
+    t.boolean "read", default: true
+    t.index ["discussion_id"], name: "index_subscriptions_on_discussion_id"
+    t.index ["user_id"], name: "index_subscriptions_on_user_id"
+  end
+
   create_table "topics", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "locale"
@@ -243,6 +276,13 @@ ActiveRecord::Schema.define(version: 20180611190239) do
     t.index ["slug"], name: "index_topics_on_slug", unique: true
   end
 
+  create_table "upvotes", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "discussion_id"
+    t.index ["discussion_id"], name: "index_upvotes_on_discussion_id"
+    t.index ["user_id"], name: "index_upvotes_on_user_id"
+  end
+
   create_table "usages", id: :serial, force: :cascade do |t|
     t.integer "organization_id"
     t.string "slug"

data/spec/evaluation_helper.rb

@@ -1,6 +1,6 @@
 Language.class_eval do
   def test_only_fake_response
-    {status: Mumuki::Laboratory::Status::Failed, result: 'noop result'}
+    {status: Mumuki::Laboratory::Status::Submission::Failed, result: 'noop result'}
   end
 
   def run_tests!(*)

data/spec/factories/discussion_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :discussion do
+    title 'A discussion'
+    description 'A discussion description'
+    initiator { create(:user) }
+    item { create(:exercise) }
+  end
+end

data/spec/features/dynamic_exam_spec.rb

@@ -4,7 +4,7 @@ feature 'Dynamic Exam', organization_workspace: :test do
   let(:user) { create(:user, id: 1) }
   let(:user2) { create(:user, id: 2) }
 
-  let!(:problem) { build(:problem, description: 'do f = $someVariable', randomizations: { someVariable: { type: :oneOf, value: %w(some_string some_other_string)} }) }
+  let!(:problem) { build(:problem, description: 'do f = $someVariable', randomizations: { someVariable: { type: :one_of, value: %w(some_string some_other_string)} }) }
 
   let!(:chapter) {
     create(:chapter, lessons: [

data/spec/helpers/exercise_input_helper_spec.rb

@@ -24,6 +24,31 @@ describe ApplicationHelper, organization_workspace: :test do
     end
   end
 
+  describe 'should_render_need_help_dropdown?' do
+    let(:assignment) { create(:assignment) }
+
+    context 'when the orga has a community link' do
+      let(:organization) { create(:organization, name: 'myorg', community_link: 'com_link') }
+      it { expect(should_render_need_help_dropdown? assignment, organization).to be true }
+    end
+    context 'when report issue enabled' do
+      let(:organization) { create(:organization, name: 'myorg', report_issue_enabled: true) }
+      it { expect(should_render_need_help_dropdown? assignment, organization).to be true }
+    end
+    context 'when forum enabled' do
+      let(:organization) { create(:organization, name: 'myorg', forum_enabled: true) }
+      it { expect(should_render_need_help_dropdown? assignment, organization).to be true }
+    end
+    context 'when ask for help is not enabled' do
+      it { expect(should_render_need_help_dropdown? assignment).to be false }
+    end
+    context 'when assignment passed' do
+      let(:organization) { create(:organization, name: 'myorg', forum_enabled: true) }
+      let(:assignment) { create(:assignment, status: :passed) }
+      it { expect(should_render_need_help_dropdown? assignment, organization).to be false }
+    end
+  end
+
   describe 'should_render_problem_tabs?' do
     let(:student) { create(:user) }
 

data/spec/helpers/test_results_rendering_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe AssignmentResultHelper do
+describe ContextualizationResultHelper do
   helper IconsHelper
-  helper AssignmentResultHelper
+  helper ContextualizationResultHelper
 
-  let(:html) { render_test_results assignment }
+  let(:html) { render_test_results contextualization }
 
   context 'structured results' do
     context 'when single passed submission' do
-      let(:assignment) { struct(
+      let(:contextualization) { struct(
         exercise: struct(hidden?: false),
         test_results: [{title: '2 is 2', status: :passed, result: ''}],
         output_content_type: Mumukit::ContentType::Plain) }
@@ -21,7 +21,7 @@ describe AssignmentResultHelper do
 
     context 'when single failed submission' do
       context 'when plain results' do
-        let(:assignment) { struct(
+        let(:contextualization) { struct(
           exercise: struct(hidden?: false),
           test_results: [{title: '2 is 2', status: :failed, result: 'something _went_ wrong'}],
           output_content_type: Mumukit::ContentType::Plain) }
@@ -32,7 +32,7 @@ describe AssignmentResultHelper do
       end
 
       context 'when markdown results' do
-        let(:assignment) { struct(
+        let(:contextualization) { struct(
           exercise: struct(hidden?: false),
           test_results: [{title: '2 is 2', status: :failed, result: 'something went _really_ wrong'}],
           output_content_type: Mumukit::ContentType::Markdown) }
@@ -45,7 +45,7 @@ describe AssignmentResultHelper do
   end
 
   context 'unstructured results' do
-    let(:assignment) { struct(
+    let(:contextualization) { struct(
       exercise: struct(hidden?: false),
       result_html: '<pre>ooops, something went wrong</pre>'.html_safe) }