mumuki-laboratory 5.8.3 → 5.9.0

data/lib/mumuki/laboratory/status.rb

@@ -38,6 +38,10 @@ module Mumuki::Laboratory::Status
       end
     end
 
+    def test_selectors
+      self::STATUSES.map { |it| "#{it}?".to_sym }
+    end
+
     def to_mumuki_status(status)
       status.send(to_status_method)
     end

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

@@ -10,20 +10,8 @@ require_relative './pending_review'
 module Mumuki::Laboratory::Status::Discussion
   STATUSES = [Opened, Closed, Solved, PendingReview]
 
-  def closed?
-    false
-  end
-
-  def opened?
-    false
-  end
-
-  def solved?
-    false
-  end
-
-  def pending_review?
-    false
+  test_selectors.each do |selector|
+    define_method(selector) { false }
   end
 
   def allowed_for?(*)

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

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

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

@@ -5,6 +5,10 @@ module Mumuki::Laboratory::Status::Submission::Errored
     true
   end
 
+  def self.should_retry?
+    true
+  end
+
   def self.group
     Mumuki::Laboratory::Status::Submission::Failed
   end

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

@@ -5,6 +5,10 @@ module Mumuki::Laboratory::Status::Submission::Failed
     true
   end
 
+  def self.should_retry?
+    true
+  end
+
   def self.iconize
     {class: :danger, type: 'times-circle'}
   end

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

@@ -1,7 +1,7 @@
 module Mumuki::Laboratory::Status::Submission::ManualEvaluationPending
   extend Mumuki::Laboratory::Status::Submission
 
-  def self.passed?
+  def self.manual_evaluation_pending?
     true
   end
 

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

@@ -5,10 +5,6 @@ module Mumuki::Laboratory::Status::Submission::Passed
     true
   end
 
-  def self.should_retry?
-    false
-  end
-
   def self.iconize
     {class: :success, type: 'check-circle'}
   end

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

@@ -1,7 +1,11 @@
 module Mumuki::Laboratory::Status::Submission::PassedWithWarnings
   extend Mumuki::Laboratory::Status::Submission
 
-  def self.passed?
+  def self.passed_with_warnings?
+    true
+  end
+
+  def self.should_retry?
     true
   end
 

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

@@ -1,6 +1,10 @@
 module Mumuki::Laboratory::Status::Submission::Pending
   extend Mumuki::Laboratory::Status::Submission
 
+  def self.pending?
+    true
+  end
+
   def self.iconize
     {class: :muted, type: :circle}
   end

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

@@ -1,6 +1,10 @@
 module Mumuki::Laboratory::Status::Submission::Running
   extend Mumuki::Laboratory::Status::Submission
 
+  def self.running?
+    true
+  end
+
   def self.group
     Mumuki::Laboratory::Status::Submission::Pending
   end

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

@@ -14,28 +14,18 @@ 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
+  test_selectors.each do |selector|
+    define_method(selector) { false }
   end
 
-  def errored?
-    false
-  end
-
-  def aborted?
-    false
+  def group
+    self
   end
 
+  # Tells if a new, different submission should be tried.
+  # True for `failed`, `errored` and `passed_with_warnings`
   def should_retry?
-    true
+    false
   end
 
   def iconize

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.8.3'
+    VERSION = '5.9.0'
   end
 end

data/spec/controllers/discussions_controller_spec.rb

@@ -16,5 +16,12 @@ describe DiscussionsController, organization_workspace: :test do
     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 }
+
+    describe 'deleting exercises does delete all discussions' do
+      before { @discussion_id = exercise.discussions.first.id }
+      before { exercise.destroy }
+
+      it { expect { Discussion.find(@discussion_id) }.to raise_exception(ActiveRecord::RecordNotFound) }
+    end
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -16,6 +16,11 @@ describe ExerciseSolutionsController, organization_workspace: :test do
     before { post :create, params: { exercise_id: problem.id, solution: { content: 'asd' } } }
 
     it { expect(response.status).to eq 200 }
+    it { expect(response.body).to json_eq(
+                                    {status: :failed, guide_finished_by_solution: false},
+                                    except: [:class_for_progress_list_item,
+                                             :html, :title_html, :button_html,
+                                             :expectations_html, :remaining_attempts_html]) }
     it { expect(Assignment.last.solution).to eq('asd')}
   end
 
@@ -25,7 +30,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
       'a_file.css' => 'a css content',
       'a_file.js' => 'a js content'
     } } } }
-    let(:files) { problem.files_for(user) }
+    let(:files) { problem.assignment_for(user).files }
 
     it { expect(response.status).to eq 200 }
     it { expect(Assignment.last.solution).to eq("/*<a_file.css#*/a css content/*#a_file.css>*/\n/*<a_file.js#*/a js content/*#a_file.js>*/") }

data/spec/controllers/messages_controller_spec.rb

@@ -12,6 +12,13 @@ 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 }
+
+    describe 'deleting exercises does delete all messages' do
+      before { @message_id = user.messages.first.id }
+      before { exercise.destroy }
+
+      it { expect { Message.find(@message_id) }.to raise_exception(ActiveRecord::RecordNotFound) }
+    end
   end
 
   describe 'post when previous assignment' do

data/spec/dummy/db/schema.rb

@@ -128,6 +128,8 @@ ActiveRecord::Schema.define(version: 20180802190437) do
     t.datetime "end_time", null: false
     t.string "classroom_id"
     t.integer "duration"
+    t.integer "max_problem_submissions"
+    t.integer "max_choice_submissions"
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"

data/spec/factories/exam_factory.rb

@@ -1,7 +1,6 @@
 FactoryBot.define do
 
-  factory :exam do
-    guide
+  factory :exam, traits: [:guide_container] do
     duration { Faker::Number.between(10, 60).minutes }
     organization { Organization.current }
     start_time { 5.minutes.ago }

data/spec/features/progressive_tips_spec.rb

@@ -8,7 +8,7 @@ feature 'Progressive Tips', organization_workspace: :test do
   let!(:problem) { build(:problem,
                           name: 'Succ1', description: 'Description of Succ1',
                           layout: :input_right, assistance_rules: [{when: :submission_failed, then: ['try this', 'try that']}] ) }
-  let(:assignment) { problem.find_or_init_assignment_for(user) }
+  let(:assignment) { problem.assignment_for(user) }
 
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
@@ -22,7 +22,7 @@ feature 'Progressive Tips', organization_workspace: :test do
     before { assignment.update! status: :failed }
 
     scenario '2 failed submissions' do
-      assignment.update! attemps_count: 2
+      assignment.update! attempts_count: 2
       visit "/exercises/#{problem.slug}"
 
       expect(page).to have_text('Try this')
@@ -30,7 +30,7 @@ feature 'Progressive Tips', organization_workspace: :test do
     end
 
     scenario '5 failed submissions' do
-      assignment.update! attemps_count: 5
+      assignment.update! attempts_count: 5
       visit "/exercises/#{problem.id}"
 
       expect(page).to_not have_text('Try this')
@@ -38,7 +38,7 @@ feature 'Progressive Tips', organization_workspace: :test do
     end
 
     scenario '10 failed submissions' do
-      assignment.update! attemps_count: 10
+      assignment.update! attempts_count: 10
       visit "/exercises/#{problem.id}"
 
       expect(page).to_not have_text('Try this')

data/spec/helpers/organization_list_helper_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe OrganizationListHelper, organization_workspace: :test do
+  helper OrganizationListHelper
+
+  context 'not not users path' do
+    let(:request) { struct path: '/guides/1' }
+
+    it { expect(organization_switch_url(Organization.current)).to eq 'http://test.localmumuki.io/guides/1' }
+  end
+
+  context 'on users path' do
+    let(:request) { struct path: '/users/' }
+    let(:controller_name) { 'users' }
+
+    it { expect(organization_switch_url(Organization.current)).to eq 'http://test.localmumuki.io/' }
+  end
+end
+
+

data/spec/models/assignment_spec.rb

@@ -52,11 +52,13 @@ describe Assignment, organization_workspace: :test do
     let(:failed_submission) { create(:assignment, status: :failed) }
     let(:passed_submission) { create(:assignment, status: :passed, expectation_results: []) }
     let(:passed_submission_with_visible_output_language) { create(:assignment, status: :passed, exercise: gobstones_exercise) }
+    let(:manual_evaluation_pending_submission) { create(:assignment, status: :manual_evaluation_pending) }
 
     it { expect(passed_submission.results_visible?).to be false }
     it { expect(failed_submission.should_retry?).to be true }
     it { expect(failed_submission.results_visible?).to be true }
     it { expect(passed_submission_with_visible_output_language.results_visible?).to be true }
+    it { expect(manual_evaluation_pending_submission.results_visible?).to be false }
   end
   describe '#expectation_results_visible?' do
     let(:haskell) { create(:language, visible_success_output: true) }

data/spec/models/event_generation_spec.rb

@@ -33,9 +33,9 @@ describe '#as_platform_json', organization_workspace: :test do
         expect(assignment.as_platform_json).to json_like(
                            status: :passed,
                            result: nil,
-                           expectation_results: nil,
+                           expectation_results: [],
                            queries: [],
-                           query_results: nil,
+                           query_results: [],
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
@@ -92,9 +92,9 @@ describe '#as_platform_json', organization_workspace: :test do
         expect(assignment.as_platform_json).to json_like(
                            status: :passed,
                            result: nil,
-                           expectation_results: nil,
+                           expectation_results: [],
                            queries: [],
-                           query_results: nil,
+                           query_results: [],
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
@@ -147,9 +147,9 @@ describe '#as_platform_json', organization_workspace: :test do
         expect(assignment.as_platform_json).to json_like(
                            status: :passed,
                            result: nil,
-                           expectation_results: nil,
+                           expectation_results: [],
                            queries: [],
-                           query_results: nil,
+                           query_results: [],
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,

data/spec/models/exercise_spec.rb

@@ -20,7 +20,7 @@ describe Exercise, organization_workspace: :test do
     context 'when there is no default content' do
       let(:exercise) { create(:exercise) }
 
-      it { expect(exercise.new_solution.content).to be_nil }
+      it { expect(exercise.new_solution.content).to be_blank }
     end
   end
 
@@ -120,16 +120,16 @@ describe Exercise, organization_workspace: :test do
                                             language: haskell)]) }
     let(:exercise) { guide.exercises.first }
 
-    it { expect(exercise.extra_preview(user)).to eq "```haskell\nf x = 1\ng y = y + 3\n```" }
+    it { expect(exercise.assignment_for(user).extra_preview).to eq "```haskell\nf x = 1\ng y = y + 3\n```" }
   end
 
   describe '#submit_solution!' do
     context 'when user did a submission' do
       before { exercise.submit_solution!(user) }
-      it { expect(exercise.assignment_for(user)).to be_present }
+      it { expect(exercise.find_assignment_for(user)).to be_present }
     end
     context 'when user did no submission' do
-      it { expect(exercise.assignment_for(user)).to be_blank }
+      it { expect(exercise.find_assignment_for(user)).to be_blank }
     end
   end
 
@@ -150,11 +150,11 @@ describe Exercise, organization_workspace: :test do
     context 'when user has a single submission for the exercise' do
       let!(:assignment) { exercise.submit_solution!(user, content: 'foo') }
 
-      it { expect(exercise.current_content_for(user)).to eq assignment.solution }
+      it { expect(assignment.current_content).to eq assignment.solution }
     end
 
     context 'when user has no submissions for the exercise' do
-      it { expect(exercise.current_content_for(user)).to eq '' }
+      it { expect(exercise.assignment_for(user).current_content).to eq '' }
     end
 
     context 'when using an interpolation' do
@@ -174,6 +174,8 @@ describe Exercise, organization_workspace: :test do
       before { reindex_current_organization! }
 
       context 'when interpolation is in default_content' do
+        let(:assignment) { exercise.assignment_for(user) }
+
         describe 'right previous content' do
           let(:exercise) { create(:exercise, default_content: interpolation) }
 
@@ -182,11 +184,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.current_content_for(user)).to eq '' }
+              it { expect(assignment.current_content).to eq '' }
             end
           end
           context 'using previousSolution' do
@@ -194,11 +196,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.current_content_for(user)).to eq '' }
+              it { expect(assignment.current_content).to eq '' }
             end
           end
         end
@@ -209,7 +211,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { second_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
           end
           context '-1 index' do
@@ -217,11 +219,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.current_content_for(user)).to eq '' }
+              it { expect(assignment.current_content).to eq '' }
             end
           end
           context '1 index' do
@@ -229,7 +231,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { first_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
           end
           context '2 index' do
@@ -237,7 +239,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { second_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
           end
           context '3 index' do
@@ -245,26 +247,30 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.current_content_for(user)).to eq 'foobar' }
+              it { expect(assignment.current_content).to eq 'foobar' }
             end
           end
         end
       end
       context 'when interpolation is in test' do
+        let(:assignment) { exercise.assignment_for(user) }
+
         context 'using user_first_name'  do
           let(:exercise) { create(:exercise, test: "<div>Hola #{interpolation}</div>") }
           let(:interpolation) { '/*...user_first_name...*/' }
 
-          it { expect(exercise.test_for(user)).to eq "<div>Hola Orlo</div>" }
+          it { expect(assignment.test).to eq "<div>Hola Orlo</div>" }
         end
 
         context 'and test is nil'  do
           let(:exercise) { create(:exercise, test: nil, expectations: [{}]) }
 
-          it { expect(exercise.test_for(user)).to eq nil }
+          it { expect(assignment.test).to eq nil }
         end
       end
       context 'when interpolation is in extra' do
+        let(:assignment) { exercise.assignment_for(user) }
+
         describe 'right previous content' do
           let(:exercise) { create(:exercise, extra: interpolation) }
 
@@ -273,11 +279,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.extra_for(user)).to eq "\n" }
+              it { expect(assignment.extra).to eq "\n" }
             end
           end
           context 'using previousSolution' do
@@ -285,11 +291,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.extra_for(user)).to eq "\n" }
+              it { expect(assignment.extra).to eq "\n" }
             end
           end
         end
@@ -300,7 +306,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { second_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
           end
           context '-1 index' do
@@ -308,11 +314,11 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
 
             context 'does not have previous submission' do
-              it { expect(exercise.extra_for(user)).to eq "\n" }
+              it { expect(assignment.extra).to eq "\n" }
             end
           end
           context '1 index' do
@@ -320,7 +326,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { first_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
           end
           context '2 index' do
@@ -328,7 +334,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { second_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
           end
           context '3 index' do
@@ -336,7 +342,7 @@ describe Exercise, organization_workspace: :test do
 
             context 'has previous submission' do
               before { previous_exercise.submit_solution!(user, content: 'foobar') }
-              it { expect(exercise.extra_for(user)).to eq "foobar\n" }
+              it { expect(assignment.extra).to eq "foobar\n" }
             end
           end
         end
@@ -344,16 +350,17 @@ describe Exercise, organization_workspace: :test do
     end
 
     context 'when user has multiple submission for the exercise' do
-      let!(:assignments) { [exercise.submit_solution!(user, content: 'foo'),
-                            exercise.submit_solution!(user, content: 'bar')] }
+      before { exercise.submit_solution!(user, content: 'foo') }
+      let!(:assignment) { exercise.submit_solution!(user, content: 'bar') }
 
-      it { expect(exercise.current_content_for(user)).to eq assignments.last.solution }
+      it { expect(assignment.current_content).to eq assignment.solution }
     end
 
     context 'when user has no solution and exercise has default content' do
       let(:exercise) { create(:exercise, default_content: '#write here...') }
+      let(:assignment) { exercise.assignment_for user }
 
-      it { expect(exercise.current_content_for(user)).to eq '#write here...' }
+      it { expect(assignment.current_content).to eq '#write here...' }
     end
   end