mumuki-laboratory 9.10.0 → 9.13.0

data/spec/javascripts/editors-spec.js

@@ -33,7 +33,7 @@ describe('editors', () => {
       }
     });
 
-    expect(mumuki.editors.getSubmission()).toEqual({"solution[content]":"the custom solution"});
+    expect(mumuki.editors.getSubmission()).toEqual({"_pristine": true, "solution[content]":"the custom solution"});
   });
 
   it('reads the form if no sources', () => {
@@ -43,7 +43,24 @@ describe('editors', () => {
         <textarea class="form-control editor" name="solution[content]" id="solution_content">the solution</textarea>
       </div>
     </form>`);
-    expect(mumuki.editors.getSubmission()).toEqual({"solution[content]":"the solution"});
+    expect(mumuki.editors.getSubmission()).toEqual({"_pristine": true, "solution[content]":"the solution"});
+  });
+
+  it('reads the form when it is not the first submission', () => {
+    $('body').html(`
+    <form role="form" class="new_solution">
+      <div class="editor-code">
+        <textarea class="form-control editor" name="solution[content]" id="solution_content">the solution</textarea>
+      </div>
+    </form>
+    <div class=" submission-results">
+      <div class="bs-callout bs-callout-success">
+        <h4 class="text-success">
+          <strong><i class="fas fa-check-circle"></i> ¡Muy bien!</strong>
+        </h4>
+      </div>
+    </div>`);
+    expect(mumuki.editors.getSubmission()).toEqual({"_pristine": false, "solution[content]":"the solution"});
   });
 
   it('reads the form if no sources and exercise is multifile', () => {
@@ -63,6 +80,7 @@ describe('editors', () => {
       </div>
     </form>`);
     expect(mumuki.editors.getSubmission()).toEqual({
+      "_pristine": true,
       "solution[content[index.html]]": "some html",
       "solution[content[receta.css]]": "some css"
     });
@@ -70,6 +88,6 @@ describe('editors', () => {
 
   it('produces empty submission if no form nor sources', () => {
     $('body').html(``);
-    expect(mumuki.editors.getSubmission()).toEqual({});
+    expect(mumuki.editors.getSubmission()).toEqual({_pristine: true});
   });
 });

data/spec/javascripts/submissions-store-spec.js

@@ -18,6 +18,17 @@ describe("SubmissionsStore", () => {
       mumuki.SubmissionsStore.setSubmissionResultFor(1, passedEmptyProgramSubmissionAndResult);
       expect(mumuki.SubmissionsStore.getLastSubmissionAndResult(1)).toEqual(passedEmptyProgramSubmissionAndResult);
     });
+
+    it("answers the last submission result, ignoring pristiness", () => {
+      mumuki.SubmissionsStore.setSubmissionResultFor(1, {
+        submission: {
+          ...emptyProgramSubmission,
+          _pristine: true
+        },
+        result: passedSubmissionResult
+      });
+      expect(mumuki.SubmissionsStore.getLastSubmissionAndResult(1)).toEqual(passedEmptyProgramSubmissionAndResult);
+    });
   });
 
   describe('getLastSubmissionStatus', () => {

data/spec/mailers/previews/user_mailer_preview.rb

@@ -3,7 +3,93 @@ class UserMailerPreview < ActionMailer::Preview
 
   # Preview this email at http://localhost:3000/rails/mailers/user_mailer/we_miss_you_notification
   def we_miss_you_reminder
-    UserMailer.we_miss_you_reminder(User.new, 1)
+    UserMailer.we_miss_you_reminder user, 1
   end
 
+  def custom_content_plain_text_notification
+    UserMailer.notification notification subject: :custom,
+                                         custom_content_plain_text: 'This is the text of the mail. Awesome!',
+                                         custom_title: 'This is the title!'
+  end
+
+  def custom_content_html_notification
+    UserMailer.notification notification subject: :custom,
+                                         custom_content_html: 'This is <em>the text</em> of the mail. <strong>Awesome!</strong>',
+                                         custom_title: 'This is the title!'
+  end
+
+  def certificate_preview
+    UserMailer.certificate certificate
+  end
+
+  def exam_registration_preview
+    notification = notification target: exam_registration, subject: :exam_registration
+
+    UserMailer.notification notification
+  end
+
+  def exam_authorization_request_approved
+    notification = notification target: exam_authorization_request('approved'), subject: :exam_authorization_request_updated
+
+    UserMailer.notification notification
+  end
+
+  def exam_authorization_request_rejected
+    notification = notification target: exam_authorization_request('rejected'), subject: :exam_authorization_request_updated
+
+    UserMailer.notification notification
+  end
+
+  private
+
+  def exam_registration
+    ExamRegistration.new id: 1,
+                         organization: organization,
+                         description: 'Some test description',
+                         start_time: 5.minute.ago,
+                         end_time: 5.minutes.since
+
+  end
+
+  def exam_authorization_request(status)
+    ExamAuthorizationRequest.new id: 1,
+                                 user: user,
+                                 status: status,
+                                 exam: exam,
+                                 organization: organization
+  end
+
+  def exam
+    Exam.new organization: organization,
+             start_time: 5.minute.ago,
+             end_time: 5.minutes.since
+  end
+
+  def user
+    User.new uid: 'some_user@gmail.com',
+             first_name: 'Some',
+             last_name: 'User',
+             verified_first_name: 'Jane',
+             verified_last_name: 'Doe',
+             last_organization: organization
+  end
+
+  def organization
+    Organization.central
+  end
+
+  def certificate
+    certificate_program = CertificateProgram.find_or_create_by!(title: 'Mumuki Certificate',
+                                                                description: 'Functional Programming',
+                                                                organization: organization,
+                                                                start_date: 1.minute.ago,
+                                                                end_date: 1.hour.since)
+
+    Certificate.new user: user, certificate_program:  certificate_program
+  end
+
+  def notification(**hash)
+    Notification.new({user: user,
+                     organization: organization}.merge hash)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.10.0
+  version: 9.13.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 9.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 9.13.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.11'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: muvment
   requirement: !ruby/object:Gem::Requirement
@@ -353,9 +353,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -363,9 +360,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -564,6 +558,7 @@ files:
 - app/helpers/menu_bar_helper.rb
 - app/helpers/messages_helper.rb
 - app/helpers/multiple_file_editor_helper.rb
+- app/helpers/notifications_helper.rb
 - app/helpers/open_graph_helper.rb
 - app/helpers/organization_breadcrumbs_helper.rb
 - app/helpers/overlapped_buttons_helper.rb
@@ -572,6 +567,7 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
+- app/helpers/time_zone_helper.rb
 - app/helpers/toast_helper.rb
 - app/helpers/user_activity_helper.rb
 - app/helpers/user_discussions_helper.rb
@@ -677,10 +673,12 @@ files:
 - app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_custom.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_free_form.html.erb
+- app/views/layouts/exercise_inputs/read_only_editors/_hidden.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_multiple_choice.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_single_choice.html.erb
 - app/views/layouts/exercise_inputs/read_only_editors/_text.erb
+- app/views/layouts/exercise_inputs/read_only_editors/_upload.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
 - app/views/layouts/modals/_avatar_picker.html.erb
@@ -694,21 +692,33 @@ files:
 - app/views/layouts/modals/_level_up.html.erb
 - app/views/layouts/modals/_new_message.html.erb
 - app/views/lessons/show.html.erb
-- app/views/notifications/_discussion.html.erb
+- app/views/notifications/_custom.html.erb
 - app/views/notifications/_dropdown.html.erb
-- app/views/notifications/_exam_authorization_request.html.erb
+- app/views/notifications/_exam_authorization_request_updated.html.erb
 - app/views/notifications/_exam_registration.html.erb
-- app/views/notifications/_message.html.erb
+- app/views/notifications/previews/_custom.html.erb
+- app/views/notifications/previews/_discussion.html.erb
+- app/views/notifications/previews/_exam_authorization_request_updated.html.erb
+- app/views/notifications/previews/_exam_registration.html.erb
+- app/views/notifications/previews/_message.html.erb
 - app/views/user_mailer/1st_reminder.html.erb
 - app/views/user_mailer/1st_reminder.text.erb
 - app/views/user_mailer/2nd_reminder.html.erb
 - 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/_mail_template.erb
 - app/views/user_mailer/certificate.html.erb
 - app/views/user_mailer/certificate.text.erb
 - app/views/user_mailer/no_submissions_reminder.html.erb
 - app/views/user_mailer/no_submissions_reminder.text.erb
+- app/views/user_mailer/notification.html.erb
+- app/views/user_mailer/notification.text.erb
+- app/views/user_mailer/notifications/_custom.html.erb
+- app/views/user_mailer/notifications/_exam_authorization_request_updated.html.erb
+- app/views/user_mailer/notifications/_exam_registration.html.erb
+- app/views/user_mailer/notifications/exam_authorization_request_updated/_approved.html.erb
+- app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb
 - app/views/users/_activity_indicator.html.erb
 - app/views/users/_avatar_list.html.erb
 - app/views/users/_basic_profile_fields.html.erb
@@ -721,7 +731,9 @@ files:
 - app/views/users/discussions.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/exam_authorizations.html.erb
+- app/views/users/manage_notifications.html.erb
 - app/views/users/messages.html.erb
+- app/views/users/notifications.html.erb
 - app/views/users/show.html.erb
 - app/views/users/terms.html.erb
 - config/i18n-tasks.yml
@@ -746,6 +758,7 @@ files:
 - lib/mumuki/laboratory/controllers/nested_in_exercise.rb
 - lib/mumuki/laboratory/controllers/notifications.rb
 - lib/mumuki/laboratory/controllers/results_rendering.rb
+- lib/mumuki/laboratory/controllers/validate_access_mode.rb
 - lib/mumuki/laboratory/engine.rb
 - lib/mumuki/laboratory/events/events.rb
 - lib/mumuki/laboratory/extensions.rb
@@ -757,6 +770,7 @@ files:
 - lib/mumuki/laboratory/locales/es.yml
 - lib/mumuki/laboratory/locales/pt.yml
 - lib/mumuki/laboratory/locales/views.es.yml
+- lib/mumuki/laboratory/mailers/message_delivery.rb
 - lib/mumuki/laboratory/version.rb
 - lib/tasks/assignments.rake
 - lib/tasks/events.rake
@@ -860,6 +874,7 @@ files:
 - spec/features/notifications_flow_spec.rb
 - spec/features/profile_flow_spec.rb
 - spec/features/progressive_tips_spec.rb
+- spec/features/read_only_flow_spec.rb
 - spec/features/runner_assets_spec.rb
 - spec/features/standard_flow_spec.rb
 - spec/features/terms_flow_spec.rb
@@ -992,6 +1007,7 @@ test_files:
 - spec/features/notifications_flow_spec.rb
 - spec/features/terms_flow_spec.rb
 - spec/features/home_private_flow_spec.rb
+- spec/features/read_only_flow_spec.rb
 - spec/features/runner_assets_spec.rb
 - spec/features/topic_flow_spec.rb
 - spec/features/complements_flow_spec.rb

data/app/views/notifications/_discussion.html.erb

@@ -1 +0,0 @@
-<%= menu_item :comments, :new_discussion_message, url_for([target.item, target]), { title: target.item.name.truncate_words(3) } %>

data/app/views/notifications/_exam_authorization_request.html.erb

@@ -1 +0,0 @@
-<%= menu_item :book_open, :exam_authorization_request_updated, exam_authorizations_user_path, { description: target.exam_registration.description } %>

data/app/views/notifications/_message.html.erb

@@ -1 +0,0 @@
-<%= menu_item :envelope, :new_message_received, url_for(target.exercise), { sender: target.sender } %>