mumuki-laboratory 5.3.0 → 5.4.0

data/spec/features/profile_flow_spec.rb

@@ -72,7 +72,7 @@ feature 'Standard Flow', organization_workspace: :test do
 
     context 'with organizations and messages' do
       scenario 'visit organizations tab' do
-        user.make_student_of! organization
+        user.make_student_of! organization.slug
         user.save!
         visit "/user#organizations"
 

data/spec/features/progressive_tips_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+feature 'Progressive Tips', organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:haskell) { create(:haskell) }
+
+  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!(:chapter) {
+    create(:chapter, name: 'Functional Programming', lessons: [
+      create(:lesson, name: 'getting-started', description: 'An awesome guide', language: haskell, exercises: [problem])
+    ]) }
+
+  before { reindex_current_organization! }
+
+  context 'visit failed exercise' do
+    before { set_current_user! user }
+    before { assignment.update! status: :failed }
+
+    scenario '2 failed submissions' do
+      assignment.update! attemps_count: 2
+      visit "/exercises/#{problem.slug}"
+
+      expect(page).to have_text('Try this')
+      expect(page).to_not have_text('Try that')
+    end
+
+    scenario '5 failed submissions' do
+      assignment.update! attemps_count: 5
+      visit "/exercises/#{problem.id}"
+
+      expect(page).to_not have_text('Try this')
+      expect(page).to have_text('Try that')
+    end
+
+    scenario '10 failed submissions' do
+      assignment.update! attemps_count: 10
+      visit "/exercises/#{problem.id}"
+
+      expect(page).to_not have_text('Try this')
+      expect(page).to have_text('Try that')
+    end
+  end
+end

data/spec/helpers/application_helper_spec.rb

@@ -4,8 +4,6 @@ describe ApplicationHelper, organization_workspace: :test do
   helper ApplicationHelper
   helper LinksHelper
 
-  before { I18n.locale = :en }
-
   describe 'page_title' do
     context 'in path' do
       let(:exercise) { lesson.exercises.first }
@@ -16,9 +14,9 @@ describe ApplicationHelper, organization_workspace: :test do
 
       before { reindex_current_organization! }
 
-      it { expect(page_title nil).to eq 'Mumuki - Improve your programming skills' }
-      it { expect(page_title Problem.new).to eq 'Mumuki - Improve your programming skills' }
-      it { expect(page_title exercise).to eq 'C1: A Guide - An Exercise - Mumuki' }
+      it { expect(page_title nil).to eq 'Mumuki - test - Improve your programming skills' }
+      it { expect(page_title Problem.new).to eq 'Mumuki - test - Improve your programming skills' }
+      it { expect(page_title exercise).to eq 'C1: A Guide - An Exercise - Mumuki - test' }
     end
   end
 

data/spec/helpers/email_helper_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe EmailHelper, organization_workspace: :test do
   helper EmailHelper
 
-  before { I18n.locale = :en }
-
   describe 'page_title' do
     let(:user) { create(:user) }
     let(:guide) { create(:guide, name: 'A Guide') }

data/spec/helpers/with_navigation_spec.rb

@@ -4,8 +4,6 @@ describe WithStudentPathNavigation, organization_workspace: :test do
   helper WithStudentPathNavigation
   helper FontAwesome::Rails::IconHelper
 
-  before { I18n.locale = :en }
-
   describe '#next_button' do
     context 'with problems' do
       let(:lesson) { create(:lesson, name: 'my guide', exercises: [

data/spec/mailers/user_mailer_spec.rb

@@ -1,16 +1,52 @@
 require "spec_helper"
 
 RSpec.describe UserMailer, type: :mailer do
+  let(:central) { create(:organization, name: 'central') }
+
+  describe '#remindable' do
+    context 'when user does not want to receive notifications' do
+      let(:user) { create :user,
+                          accepts_reminders: false,
+                          last_organization: central,
+                          last_submission_date: nil }
+      it { expect(User.remindable).to_not include user }
+    end
+
+    context 'when user wants to receive notifications, and has never submitted' do
+      let(:user) { create :user,
+                          accepts_reminders: true,
+                          last_organization: central,
+                          last_submission_date: nil }
+      it { expect(User.remindable).to include user }
+    end
+
+    context 'when user wants to receive notifications, and has not sent submissions recently' do
+      let(:user) { create :user,
+                          accepts_reminders: true,
+                          last_organization: central,
+                          last_submission_date: 30.days.ago }
+      it { expect(User.remindable).to include user }
+    end
+
+    context 'when user wants to receive notifications, and has sent submissions recently' do
+      let(:user) { create :user,
+                          accepts_reminders: true,
+                          last_organization: central,
+                          last_submission_date: 15.minutes.ago }
+      it { expect(User.remindable).to_not include user }
+    end
+  end
 
   describe "we_miss_you_reminder" do
     let(:reminder) { user.build_reminder }
-    let(:central) { create(:organization, name: 'central') }
-    let(:user) { build :user, last_organization: central, last_submission_date: days_since_last_submission.days.ago, last_reminded_date: days_since_last_reminded.days.ago }
+    let(:user) { build :user,
+                       last_organization: central,
+                       last_submission_date: days_since_last_submission.days.ago,
+                       last_reminded_date: days_since_last_reminded.days.ago }
 
     let(:days_since_last_submission) { 9 }
     let(:days_since_last_reminded) { 8 }
 
-
     it "renders the headers" do
       expect(reminder.subject).to eq("We miss you!")
       expect(reminder.to).to eq([user.email])
@@ -23,32 +59,32 @@ RSpec.describe UserMailer, type: :mailer do
       context "last submission this week" do
         let(:days_since_last_submission) { 3 }
 
-        it { expect(user.should_send_reminder?).to be false }
+        it { expect(user.should_remind?).to be false }
       end
 
       context "last submission 1 week ago" do
-        it { expect(user.should_send_reminder?).to be true }
+        it { expect(user.should_remind?).to be true }
         it { expect(reminder.body.encoded).to include("Keep learning") }
       end
 
       context "last submission 2 weeks ago" do
         let(:days_since_last_submission) { 16 }
 
-        it { expect(user.should_send_reminder?).to be true }
+        it { expect(user.should_remind?).to be true }
         it { expect(reminder.body.encoded).to include("Keep learning") }
       end
 
       context "last submission 3 weeks ago" do
         let(:days_since_last_submission) { 26 }
 
-        it { expect(user.should_send_reminder?).to be true }
+        it { expect(user.should_remind?).to be true }
         it { expect(reminder.body.encoded).to include("Keep learning") }
       end
 
       context "last submission 4 weeks ago" do
         let(:days_since_last_submission) { 30 }
 
-        it { expect(user.should_send_reminder?).to be false }
+        it { expect(user.should_remind?).to be false }
       end
     end
 
@@ -58,12 +94,70 @@ RSpec.describe UserMailer, type: :mailer do
       context "last submission this week" do
         let(:days_since_last_submission) { 3 }
 
-        it { expect(user.should_send_reminder?).to be false }
+        it { expect(user.should_remind?).to be false }
       end
 
       context "last submission 1 week ago" do
-        it { expect(user.should_send_reminder?).to be false }
+        it { expect(user.should_remind?).to be false }
       end
     end
   end
+
+  describe "no_submissions_reminder" do
+    let(:reminder) { user.build_reminder }
+    let(:user) { build :user, last_organization: central,
+                              last_submission_date: nil,
+                              last_reminded_date: days_since_last_reminded.days.ago,
+                              created_at: days_since_user_creation.days.ago }
+
+    let(:days_since_last_reminded) { 8 }
+    let(:days_since_user_creation) { 8 }
+
+    it "renders the headers" do
+      expect(reminder.subject).to eq("Start using Mumuki!")
+      expect(reminder.to).to eq([user.email])
+      expect(reminder.from).to eq(["support@mumuki.org"])
+    end
+
+    context 'last reminded over 1 week ago' do
+      let(:days_since_last_reminded) { 8 }
+
+      context "registered this week" do
+        let(:days_since_user_creation) { 3 }
+
+        it { expect(user.should_remind?).to be false }
+      end
+
+      context "registered 1 week ago" do
+        it { expect(user.should_remind?).to be true }
+        it { expect(reminder.body.encoded).to include("you've never submitted solutions") }
+      end
+
+      context "last submission 2 weeks ago" do
+        let(:days_since_user_creation) { 16 }
+
+        it { expect(user.should_remind?).to be true }
+        it { expect(reminder.body.encoded).to include("you've never submitted solutions") }
+      end
+
+      context "last submission 3 weeks ago" do
+        let(:days_since_user_creation) { 26 }
+
+        it { expect(user.should_remind?).to be true }
+        it { expect(reminder.body.encoded).to include("you've never submitted solutions") }
+      end
+
+      context "last submission 4 weeks ago" do
+        let(:days_since_user_creation) { 30 }
+
+        it { expect(user.should_remind?).to be false }
+      end
+    end
+
+    context 'last reminded this week' do
+      let(:days_since_last_reminded) { 2 }
+
+      it { expect(user.should_remind?).to be false }
+    end
+  end
 end

data/spec/models/event_generation_spec.rb

@@ -39,6 +39,7 @@ describe '#as_platform_json', organization_workspace: :test do
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              eid: exercise.bibliotheca_id,
@@ -97,6 +98,7 @@ describe '#as_platform_json', organization_workspace: :test do
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              name: exercise.name,
@@ -151,6 +153,7 @@ describe '#as_platform_json', organization_workspace: :test do
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              eid: exercise.bibliotheca_id,

data/spec/models/exercise_spec.rb

@@ -4,8 +4,6 @@ describe Exercise, organization_workspace: :test do
   let(:exercise) { create(:exercise) }
   let(:user) { create(:user) }
 
-  before { I18n.locale = :en }
-
   describe '#slug' do
     let(:guide) { create(:guide, slug: 'foo/bar') }
     let(:exercise) { create(:exercise, guide: guide, bibliotheca_id: 4) }

data/spec/models/guide_import_spec.rb

@@ -25,6 +25,10 @@ describe Guide do
           teacher_info: 'an info',
           language: 'gobstones',
           solution: 'foo',
+          assistance_rules: [
+            {when: :content_empty, then: 'remember to copy the code in the editor!'},
+            {when: :submission_errored, then: 'remember to copy code exactly as presented'},
+          ],
           id: 1},
 
          {type: 'playground',
@@ -138,6 +142,9 @@ describe Guide do
       it { expect(guide.exercises.count).to eq 5 }
       it { expect(guide.exercises.first.language).to eq gobstones }
       it { expect(guide.exercises.first.extra_visible).to be false }
+      it { expect(guide.exercises.first.assistance_rules).to be_present }
+      it { expect(guide.exercises.first.assistant.rules.count).to eq 2 }
+
       it { expect(guide.exercises.second.language).to eq haskell }
       it { expect(guide.exercises.second.default_content).to eq 'a default content' }
       it { expect(guide.exercises.second.extra_visible).to be true }

data/spec/models/organization_spec.rb

@@ -81,7 +81,6 @@ describe Organization, organization_workspace: :test do
     let(:fresh_organization) { create(:organization, name: 'foo') }
     it { expect(fresh_organization.login_settings.login_methods).to eq Mumukit::Login::Settings.default_methods }
     it { expect(fresh_organization.login_settings.social_login_methods).to eq [] }
-    it { expect(fresh_organization.login_settings.to_lock_json('/foo')).to be_html_safe }
   end
 
   describe 'validations' do

data/spec/models/playground_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe Playground do
   let(:user) { create(:user) }
 
-  before { I18n.locale = :en }
-
   describe '#create' do
     context 'when language is queriable and exercise is playable' do
       let(:language) { create(:language, queriable: true) }

data/spec/models/user_spec.rb

@@ -252,4 +252,12 @@ describe User, organization_workspace: :test do
       student.resubmit! Organization.current.name
     end
   end
+
+  describe '#accept_invitation!' do
+    let(:student) { create :user }
+    let(:invitation) { create :invitation, course: 'some_orga/some_course' }
+    before { student.accept_invitation! invitation }
+    it { expect(student.student? invitation.course).to be true }
+    it { expect(student.student? 'foo/bar').to be false }
+  end
 end

data/spec/spec_helper.rb

@@ -28,6 +28,8 @@ require_relative './capybara_helper'
 require_relative './evaluation_helper'
 
 RSpec.configure do |config|
+  config.before(:each) { I18n.locale = :en }
+
   config.before(:each) do
     if RSpec.current_example.metadata[:organization_workspace] == :test
       set_subdomain_host! 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: mumukit-assistant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +333,7 @@ files:
 - app/models/book.rb
 - app/models/chapter.rb
 - app/models/complement.rb
+- app/models/concerns/assistable.rb
 - app/models/concerns/friendly_name.rb
 - app/models/concerns/guide_container.rb
 - app/models/concerns/navigation/parent_navigation.rb
@@ -389,6 +404,7 @@ files:
 - app/views/errors/not_found.html.erb
 - app/views/errors/unauthorized.html.erb
 - app/views/exams/show.html.erb
+- app/views/exercise_solutions/_expectations.html.erb
 - app/views/exercise_solutions/_kids_results.html.erb
 - app/views/exercise_solutions/_kids_results_button.html.erb
 - app/views/exercise_solutions/_results.html.erb
@@ -444,6 +460,8 @@ files:
 - app/views/user_mailer/2nd_reminder.text.erb
 - app/views/user_mailer/3rd_reminder.html.erb
 - app/views/user_mailer/3rd_reminder.text.erb
+- app/views/user_mailer/no_submissions_reminder.html.erb
+- app/views/user_mailer/no_submissions_reminder.text.erb
 - app/views/users/_users_form.html.erb
 - app/views/users/show.html.erb
 - config/i18n-tasks.yml
@@ -679,10 +697,12 @@ files:
 - db/migrate/20180129142749_add_api_client.rb
 - db/migrate/20180130194923_add_last_reminded_date_to_users.rb
 - db/migrate/20180130204935_add_course.rb
+- db/migrate/20180307150148_add_failed_submissions_count_to_assignments.rb
 - db/migrate/20180323125804_remove_user_name.rb
 - db/migrate/20180323140943_remove_unused_omniauth_fields.rb
 - db/migrate/20180326224511_remove_book_ids.rb
 - db/migrate/20180402015405_remove_course_uid.rb
+- db/migrate/20180526141344_add_tips_rules_to_exercise.rb
 - db/seeds/users.rb
 - lib/events.rb
 - lib/mumuki/laboratory.rb
@@ -711,6 +731,9 @@ files:
 - lib/mumuki/laboratory/locales/datetime.es.yml
 - lib/mumuki/laboratory/locales/en.yml
 - lib/mumuki/laboratory/locales/es.yml
+- lib/mumuki/laboratory/locales/narrator.en.yml
+- lib/mumuki/laboratory/locales/narrator.es.yml
+- lib/mumuki/laboratory/locales/narrator.pt.yml
 - lib/mumuki/laboratory/locales/pt.yml
 - lib/mumuki/laboratory/locales/views.es.yml
 - lib/mumuki/laboratory/mumukit/auth.rb
@@ -830,6 +853,7 @@ files:
 - spec/features/menu_bar_spec.rb
 - spec/features/not_found_flow_spec.rb
 - spec/features/profile_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
 - spec/features/standard_flow_spec.rb
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/email_helper_spec.rb
@@ -1010,6 +1034,7 @@ test_files:
 - spec/features/menu_bar_spec.rb
 - spec/features/not_found_flow_spec.rb
 - spec/features/profile_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
 - spec/features/standard_flow_spec.rb
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/email_helper_spec.rb