mumuki-laboratory 5.7.0 → 5.8.0

data/spec/factories/guide_factory.rb

@@ -2,15 +2,15 @@ FactoryBot.define do
 
   factory :guide do
     sequence(:name) { |n| "guide#{n}" }
-    locale 'en'
-    description 'A Guide'
+    locale { 'en' }
+    description { 'A Guide' }
     slug { "flbulgarelli/mumuki-sample-guide-#{SecureRandom.uuid}" }
     language
   end
 
   trait :guide_container do
     transient do
-      exercises []
+      exercises { [] }
       name { Faker::Lorem.sentence(3) }
       description { Faker::Lorem.sentence(10) }
       language { create(:language) }

data/spec/factories/login_settings_factory.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
   factory :all_login_settings, class: Mumukit::Login::Settings do
-    login_methods Mumukit::Login::Settings.login_methods
+    login_methods { Mumukit::Login::Settings.login_methods }
   end
 end

data/spec/factories/message_factory.rb

@@ -5,7 +5,7 @@ FactoryBot.define do
     assignment
     submission_id { assignment.id }
     sender { Faker::Internet.email }
-    type 'success'
+    type { 'success' }
     content { Faker::Lorem.sentence(3) }
   end
 end

data/spec/factories/organization_factory.rb

@@ -2,25 +2,25 @@ FactoryBot.define do
 
   factory :organization do
     contact_email { Faker::Internet.email }
-    description 'a great org'
-    locale 'en'
+    description { 'a great org' }
+    locale { 'en' }
     settings {}
     book
   end
 
   factory :base, parent: :organization do
-    public true
-    name 'base'
-    login_methods Mumukit::Login::Settings.login_methods
+    public { true }
+    name { 'base' }
+    login_methods { Mumukit::Login::Settings.login_methods }
   end
 
   factory :public_organization, parent: :organization do
-    public true
-    name 'the-public-org'
-    login_methods Mumukit::Login::Settings.login_methods
+    public { true }
+    name { 'the-public-org' }
+    login_methods { Mumukit::Login::Settings.login_methods }
   end
 
   factory :private_organization, parent: :organization do
-    name 'the-private-org'
+    name { 'the-private-org' }
   end
 end

data/spec/factories/topic_factory.rb

@@ -4,6 +4,6 @@ FactoryBot.define do
     name { Faker::Lorem::sentence(3) }
     description { Faker::Lorem.paragraph(2) }
     slug { "mumuki/mumuki-sample-topic-#{SecureRandom.uuid}" }
-    locale :en
+    locale { :en }
   end
 end

data/spec/features/choose_organization_spec.rb

@@ -19,67 +19,74 @@ feature 'Choose organization Flow' do
   end
 
   before { Organization.find_by_name('immersive-orga').tap { |it| it.immersive = true }.save! }
-
-  before { Organization.central.switch! }
   before { set_current_user! user }
 
-  scenario 'when visiting with implicit subdomain and no permissions' do
-    set_implicit_central!
+  context 'when organization exists' do
+    before { Organization.central.switch! }
 
-    visit '/'
+    scenario 'when visiting with implicit subdomain and no permissions' do
+      set_implicit_central!
 
-    expect(page).to have_text('Sign Out')
-    expect(page).not_to have_text('Do you want to go there?')
-  end
+      visit '/'
 
-  scenario 'when visiting with implicit subdomain and permissions to only one non-immersive organization' do
-    set_current_user! user2
-    set_implicit_central!
+      expect(page).to have_text('Sign Out')
+      expect(page).not_to have_text('Do you want to go there?')
+    end
 
-    visit '/'
+    scenario 'when visiting with implicit subdomain and permissions to only one non-immersive organization' do
+      set_current_user! user2
+      set_implicit_central!
 
-    expect(page).to have_text('Sign Out')
-    expect(page).to have_text('Do you want to go there?')
-  end
+      visit '/'
 
-  scenario 'when visiting with implicit subdomain and permissions to only one immersive organization' do
-    set_current_user! user4
-    set_implicit_central!
+      expect(page).to have_text('Sign Out')
+      expect(page).to have_text('Do you want to go there?')
+    end
 
-    visit '/'
+    scenario 'when visiting with implicit subdomain and permissions to only one immersive organization' do
+      set_current_user! user4
+      set_implicit_central!
 
-    expect(page).to have_text('Sign Out')
-    expect(page).not_to have_text('Do you want to go there?')
-    expect(page).to have_text('immersive-orga')
-  end
+      visit '/'
 
-  scenario 'when visiting with implicit subdomain and permissions to two or more organizations' do
-    set_current_user! user3
-    set_implicit_central!
+      expect(page).to have_text('Sign Out')
+      expect(page).not_to have_text('Do you want to go there?')
+      expect(page).to have_text('immersive-orga')
+    end
 
-    visit '/'
+    scenario 'when visiting with implicit subdomain and permissions to two or more organizations' do
+      set_current_user! user3
+      set_implicit_central!
 
-    expect(page).to have_text('Sign Out')
-    expect(page).to have_text('Do you want to go there?')
-  end
+      visit '/'
 
-  scenario 'when visiting central explicitly' do
-    set_subdomain_host!('central')
+      expect(page).to have_text('Sign Out')
+      expect(page).to have_text('Do you want to go there?')
+    end
 
-    visit '/'
+    scenario 'when visiting central explicitly' do
+      set_subdomain_host!('central')
 
-    expect(page).not_to have_text('Do you want to go there?')
-    expect(page).not_to have_text('pdep')
-  end
+      visit '/'
 
-  scenario 'when visit foo subdomain' do
-    set_current_user! user3
-    set_subdomain_host!('foo')
+      expect(page).not_to have_text('Do you want to go there?')
+      expect(page).not_to have_text('pdep')
+    end
 
-    visit '/'
+    scenario 'when visit foo subdomain' do
+      set_current_user! user3
+      set_subdomain_host!('foo')
 
-    expect(page).not_to have_text('Do you want to go there?')
-    expect(page).to have_text('foo')
+      visit '/'
+
+      expect(page).not_to have_text('Do you want to go there?')
+      expect(page).to have_text('foo')
+    end
   end
 
+  scenario 'when organization does not exist' do
+    visit '/'
+
+    expect(page).to have_http_status(404)
+  end
 end

data/spec/models/exercise_spec.rb

@@ -123,37 +123,13 @@ describe Exercise, organization_workspace: :test do
     it { expect(exercise.extra_preview(user)).to eq "```haskell\nf x = 1\ng y = y + 3\n```" }
   end
 
-  describe '#submitted_by?' do
+  describe '#submit_solution!' do
     context 'when user did a submission' do
       before { exercise.submit_solution!(user) }
-      it { expect(exercise.assigned_to? user).to be true }
+      it { expect(exercise.assignment_for(user)).to be_present }
     end
     context 'when user did no submission' do
-      it { expect(exercise.assigned_to? user).to be false }
-    end
-  end
-
-  describe '#solved_by?' do
-    context 'when user did no submission' do
-      it { expect(exercise.solved_by? user).to be false }
-    end
-    context 'when user did a successful submission' do
-      before { exercise.submit_solution!(user).passed! }
-
-      it { expect(exercise.solved_by? user).to be true }
-    end
-    context 'when user did a pending submission' do
-      before { exercise.submit_solution!(user) }
-
-      it { expect(exercise.solved_by? user).to be false }
-    end
-    context 'when user did both successful and failed submissions' do
-      before do
-        exercise.submit_solution!(user)
-        exercise.submit_solution!(user).passed!
-      end
-
-      it { expect(exercise.solved_by? user).to be true }
+      it { expect(exercise.assignment_for(user)).to be_blank }
     end
   end
 

data/spec/models/query_spec.rb

@@ -15,7 +15,7 @@ describe Query do
 
     it { expect(results[:status]).to eq :passed }
     it { expect(results[:result]).to eq '5' }
-    it { expect(exercise.assigned_to? user).to be true }
+    it { expect(exercise.assignment_for(user)).to be_present }
     it { expect(assignment.solution).to eq 'bar' }
     it { expect(assignment.status).to eq :pending }
   end

data/spec/models/question_spec.rb

@@ -14,7 +14,7 @@ describe Query, organization_workspace: :test do
       it { expect(assignment.result).to be nil }
 
       it { expect(assignment.solution).to be nil }
-      it { expect(exercise.assigned_to? student).to be true }
+      it { expect(exercise.assignment_for(student)).to be_present }
       it { expect(assignment.messages.count).to eq 1 }
       it { expect(assignment.submission_id).to_not be nil }
     end
@@ -28,7 +28,7 @@ describe Query, organization_workspace: :test do
 
       before { exercise.submit_question!(student, content: 'Please help!') }
 
-      it { expect(exercise.assigned_to? student).to be true }
+      it { expect(exercise.assignment_for(student)).to be_present }
       it { expect(assignment.status).to eq :failed }
       it { expect(assignment.result).to eq 'noop result' }
       it { expect(assignment.solution).to eq 'x = 1' }

data/spec/models/stats_spec.rb

@@ -3,20 +3,13 @@ require 'spec_helper'
 describe Stats do
 
   context 'with good stats' do
-    let(:stats) { Stats.new(passed: 6, passed_with_warnings: 3, failed: 1, unknown: 0) }
+    let(:stats) { Stats.new(passed: 6, passed_with_warnings: 3, failed: 1, pending: 0) }
     it { expect(stats.done?).to be false }
   end
 
 
   context 'with bad stats' do
-    let(:stats) { Stats.new(passed: 1, passed_with_warnings: 0, failed: 4, unknown: 5) }
+    let(:stats) { Stats.new(passed: 1, passed_with_warnings: 0, failed: 4, pending: 5) }
     it { expect(stats.done?).to be false }
   end
-
-  describe '#to_h' do
-    let(:hash) { {passed: 4, passed_with_warnings: 3, failed: 2, unknown: 1} }
-    let(:stats) { Stats.new(hash) }
-
-    it { expect(stats.to_h { |it| it }).to eq(hash) }
-  end
 end

data/spec/models/user_spec.rb

@@ -260,4 +260,17 @@ describe User, organization_workspace: :test do
     it { expect(student.student? invitation.course).to be true }
     it { expect(student.student? 'foo/bar').to be false }
   end
+
+  describe '#currently_in_exam?' do
+    let(:student_not_in_exam) { create :user }
+    let(:student_in_exam) { create :user }
+    let(:exam) { create :exam }
+
+    before { exam.authorize! student_in_exam }
+    before { exam.authorize! student_not_in_exam }
+    before { exam.start! student_in_exam }
+
+    it { expect(student_not_in_exam.currently_in_exam?).to be false }
+    it { expect(student_in_exam.currently_in_exam?).to be true }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -273,6 +273,7 @@ files:
 - app/assets/javascripts/application/load-error-svg.js
 - app/assets/javascripts/application/messages.js
 - app/assets/javascripts/application/multiple-choice.js
+- app/assets/javascripts/application/multiple-files.js
 - app/assets/javascripts/application/pin.js
 - app/assets/javascripts/application/progress.js
 - app/assets/javascripts/application/submission.js
@@ -368,6 +369,7 @@ files:
 - app/helpers/links_helper.rb
 - app/helpers/menu_bar_helper.rb
 - app/helpers/messages_helper.rb
+- app/helpers/multiple_file_editor_helper.rb
 - app/helpers/organization_list_helper.rb
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
@@ -485,6 +487,7 @@ files:
 - app/views/exercises/show.html.erb
 - app/views/invitations/show.html.erb
 - app/views/layouts/_authoring.html.erb
+- app/views/layouts/_copyright.html.erb
 - app/views/layouts/_discussions.html.erb
 - app/views/layouts/_error.html.erb
 - app/views/layouts/_guide.html.erb
@@ -497,6 +500,7 @@ files:
 - app/views/layouts/_progress_listing.html.erb
 - app/views/layouts/_result.html.erb
 - app/views/layouts/_runner_assets.html.erb
+- app/views/layouts/_social_media.html.erb
 - app/views/layouts/_submission_result_error.html.erb
 - app/views/layouts/_submission_result_error_body.html.erb
 - app/views/layouts/_test_results.html.erb
@@ -791,6 +795,7 @@ files:
 - db/migrate/20180702153442_create_upvotes.rb
 - db/migrate/20180702175220_add_upvotes_count_to_discussions.rb
 - db/migrate/20180704150839_rename_assignment_status_to_submission_status.rb
+- db/migrate/20180802190437_add_approved_to_messages.rb
 - db/seeds/users.rb
 - lib/events.rb
 - lib/mumuki/laboratory.rb
@@ -809,6 +814,7 @@ files:
 - lib/mumuki/laboratory/evaluation/automated.rb
 - lib/mumuki/laboratory/evaluation/manual.rb
 - lib/mumuki/laboratory/exceptions.rb
+- lib/mumuki/laboratory/exceptions/blocked_forum_error.rb
 - lib/mumuki/laboratory/exceptions/forbidden_error.rb
 - lib/mumuki/laboratory/exceptions/gone_error.rb
 - lib/mumuki/laboratory/exceptions/not_found_error.rb
@@ -849,7 +855,6 @@ files:
 - lib/mumuki/laboratory/status/submission/pending.rb
 - lib/mumuki/laboratory/status/submission/running.rb
 - lib/mumuki/laboratory/status/submission/submission.rb
-- lib/mumuki/laboratory/status/submission/unknown.rb
 - lib/mumuki/laboratory/version.rb
 - lib/tasks/assignments.rake
 - lib/tasks/events.rake

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

@@ -1,11 +0,0 @@
-module Mumuki::Laboratory::Status::Submission::Unknown
-  extend Mumuki::Laboratory::Status::Submission
-
-  def self.to_i
-    raise 'unknown status'
-  end
-
-  def self.iconize
-    {class: :muted, type: :circle}
-  end
-end