mumuki-laboratory 7.10.3 → 7.12.0

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

@@ -12,33 +12,166 @@ describe("SubmissionsStore", () => {
   describe('getLastSubmission', () => {
     it("answers null if submission not present", () => {
       expect(mumuki.SubmissionsStore.getLastSubmissionAndResult(1)).toBe(null)
-    })
+    });
 
     it("answers the last submission result if already sent", () => {
       mumuki.SubmissionsStore.setSubmissionResultFor(1, passedEmptyProgramSubmissionAndResult)
       expect(mumuki.SubmissionsStore.getLastSubmissionAndResult(1)).toEqual(passedEmptyProgramSubmissionAndResult)
-    })
-  })
+    });
+  });
 
   describe('getLastSubmissionStatus', () => {
     it("answers pending if submission not present", () => {
       expect(mumuki.SubmissionsStore.getLastSubmissionStatus(1)).toBe('pending')
-    })
+    });
 
     it("answers the last submission status if previously sent", () => {
       mumuki.SubmissionsStore.setSubmissionResultFor(1, passedEmptyProgramSubmissionAndResult)
       expect(mumuki.SubmissionsStore.getLastSubmissionStatus(1)).toBe('passed')
-    })
+    });
   });
 
   describe('getCachedResultFor', () => {
     it("answers null if submission not present", () => {
       expect(mumuki.SubmissionsStore.getSubmissionResultFor(1, emptyProgramSubmission)).toBe(null)
-    })
+    });
 
     it("answers the last submission if previously sent", () => {
       mumuki.SubmissionsStore.setSubmissionResultFor(1, passedEmptyProgramSubmissionAndResult)
       expect(mumuki.SubmissionsStore.getSubmissionResultFor(1, emptyProgramSubmission)).toEqual(passedSubmissionResult)
+    });
+  });
+
+  describe('submissionSolutionContent', () => {
+    it("works with programatic solutions", () => {
+      expect(mumuki.SubmissionsStore.submissionSolutionContent({solution: {content: 'foo'}})).toEqual('foo');
+    });
+
+    it("works with classic solutions", () => {
+      expect(mumuki.SubmissionsStore.submissionSolutionContent({'solution[content]': 'foo'})).toEqual('foo');
+    });
+
+    it("works with multifile solutions", () => {
+      expect(mumuki.SubmissionsStore.submissionSolutionContent({
+        'solution[content[index.html]]': 'html foo',
+        'solution[content[index.css]]': 'css foo'
+      })).toEqual('[["solution[content[index.html]]","html foo"],["solution[content[index.css]]","css foo"]]');
+    });
+  });
+
+  describe('submissionSolutionEquals', () => {
+    describe('programatic submissions', () => {
+      it("answers true when they are equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {solution: {content: 'foo'}},
+          {solution: {content: 'foo'}})).toBe(true);
+      });
+
+      it("answers true when they are equal but empty", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {solution: {content: ''}},
+          {solution: {content: ''}})).toBe(true);
+      });
+
+      it("answers true when they are equal and there are other spurious keys", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {solution: {content: 'foo'}, utf8: "✓"},
+          {solution: {content: 'foo'}})).toBe(true);
+      });
+
+      it("answers false when they are not equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {solution: {content: 'foo'}},
+          {solution: {content: 'bar'}})).toBe(false);
+      });
+
+      it("answers false when they are not equal but one of them is empty", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {solution: {content: ''}},
+          {solution: {content: 'bar'}})).toBe(false);
+      });
+    })
+
+    describe('classic submissons', () => {
+      it("answers true when they are equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {'solution[content]': 'foo'},
+          {'solution[content]': 'foo'})).toBe(true);
+      });
+
+      it("answers true when they are equal but empty", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {'solution[content]': ''},
+          {'solution[content]': ''})).toBe(true);
+      });
+
+      it("answers true when they are equal with other spurious keys", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {'solution[content]': 'foo'},
+          {'solution[content]': 'foo', utf8: "✓"})).toBe(true);
+      });
+
+      it("answers false when they are not equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {'solution[content]': 'foo'},
+          {'solution[content]': 'bar'})).toBe(false);
+      });
+
+      it("answers false when they are not equal but one of them is empty", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {'solution[content]': ''},
+          {'solution[content]': 'bar'})).toBe(false);
+      });
+    })
+
+    describe('multifile submissions', () => {
+      it("answers true when they are equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          },
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          })).toBe(true);
+      });
+
+      it("answers true when they are equal with spurious keys", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {
+            'multifile-locales': '{"insert_file_name":"Ingresa un nombre de archivo"}',
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          },
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          })).toBe(true);
+      });
+
+      it("answers false when they are not equal", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          },
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css bar'
+          })).toBe(false);
+      });
+
+      it("answers false when they are not equal and with different keys", () => {
+        expect(mumuki.SubmissionsStore.submissionSolutionEquals(
+          {
+            'solution[content[index.html]]': 'html foo',
+            'solution[content[index.css]]': 'css foo'
+          },
+          {
+            'solution[content[index.html]]': 'html foo'
+          })).toBe(false);
+      });
     })
   });
 })

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec/rails'
 require 'codeclimate-test-reporter'
 require 'mumukit/core/rspec'
 require 'factory_bot_rails'
+require 'webdrivers'
 
 require 'mumuki/domain/factories'
 
@@ -41,6 +42,7 @@ RSpec.configure do |config|
       set_subdomain_host! 'test'
       create(:public_organization,
           name: 'test',
+          immersible: true,
           book: create(:book, name: 'test', slug: 'mumuki/mumuki-the-book')).switch!
     elsif RSpec.current_example.metadata[:organization_workspace] == :base
       set_subdomain_host! 'base'

data/spec/teaspoon_env.rb

@@ -1,3 +1,6 @@
+require 'selenium-webdriver'
+require 'webdrivers'
+
 unless defined?(Rails)
   ENV["RAILS_ROOT"] = File.expand_path("../dummy", __FILE__)
   require File.expand_path("../dummy/config/environment", __FILE__)
@@ -108,12 +111,27 @@ Teaspoon.configure do |config|
   # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
   #  config.driver = :capybara_webkit
   config.driver = :selenium
-  config.driver_options = {
-    client_driver: :firefox,
-     selenium_options: {
-      options: Selenium::WebDriver::Firefox::Options.new(log_level: :warn)
-    }
-  }
+  config.driver_options =
+    case ENV['MUMUKI_SELENIUM_DRIVER']
+    when 'chrome'
+      {
+        client_driver: :chrome,
+        selenium_options: {
+          options: Selenium::WebDriver::Chrome::Options.new(args: ['headless', 'disable-gpu'])
+        }
+      }
+    when 'safari'
+      {
+        client_driver: :safari,
+      }
+    else
+      {
+        client_driver: :firefox,
+        selenium_options: {
+          options: Selenium::WebDriver::Firefox::Options.new(log_level: :warn, args: ['-headless'])
+        }
+      }
+    end
 
   # Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be
   # considered a failure. This is to avoid issues that can arise where tests stall.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.10.3
+  version: 7.12.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.10.0
+        version: 7.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.10.0
+        version: 7.12.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.3
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.3
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: muvment
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
 description: Where students practice and receive automated and human feedback.
 email:
 - franco@mumuki.org
@@ -349,9 +363,11 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/events.js
 - app/assets/javascripts/mumuki_laboratory/application/exercise.js
 - app/assets/javascripts/mumuki_laboratory/application/free-form.js
+- app/assets/javascripts/mumuki_laboratory/application/gamification.js
 - app/assets/javascripts/mumuki_laboratory/application/inputs.js
 - app/assets/javascripts/mumuki_laboratory/application/interval.js
 - app/assets/javascripts/mumuki_laboratory/application/kids.js
+- app/assets/javascripts/mumuki_laboratory/application/kindergarten.js
 - app/assets/javascripts/mumuki_laboratory/application/load-analytics.js
 - app/assets/javascripts/mumuki_laboratory/application/load-error-svg.js
 - app/assets/javascripts/mumuki_laboratory/application/messages.js
@@ -386,9 +402,9 @@ files:
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_avatar.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_book_header.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_breadcrumb.scss
-- app/assets/stylesheets/mumuki_laboratory/application/modules/_chapter_show.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_checkboxes.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_console.scss
+- app/assets/stylesheets/mumuki_laboratory/application/modules/_content_show.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_datepicker.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_dropdown.scss
@@ -402,12 +418,14 @@ files:
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_kids.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_kids_results.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss
+- app/assets/stylesheets/mumuki_laboratory/application/modules/_medal.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_modal.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_organization_chooser.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_overlap.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_popover.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_progress_bar.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_progress_listing.scss
+- app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_timer.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_upload.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss
@@ -471,7 +489,9 @@ files:
 - app/helpers/exercise_input_helper.rb
 - app/helpers/globals_helper.rb
 - app/helpers/icons_helper.rb
+- app/helpers/kindergarten_helper.rb
 - app/helpers/links_helper.rb
+- app/helpers/medal_helper.rb
 - app/helpers/menu_bar_helper.rb
 - app/helpers/messages_helper.rb
 - app/helpers/multiple_file_editor_helper.rb
@@ -487,6 +507,7 @@ files:
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
 - app/views/appendixes/show.html.erb
+- app/views/book/_header.html.erb
 - app/views/book/show.html.erb
 - app/views/book_discussions/index.html.erb
 - app/views/chapters/show.html.erb
@@ -498,6 +519,7 @@ files:
 - app/views/discussions/index.html.erb
 - app/views/discussions/new.html.erb
 - app/views/discussions/show.html.erb
+- app/views/discussions/terms.html.erb
 - app/views/errors/forbidden.html.erb
 - app/views/errors/gone.html.erb
 - app/views/errors/internal_server_error.html.erb
@@ -526,6 +548,7 @@ files:
 - app/views/layouts/_exercise_skipped.html.erb
 - app/views/layouts/_guide.html.erb
 - app/views/layouts/_kids.html.erb
+- app/views/layouts/_kindergarten.html.erb
 - app/views/layouts/_main.html.erb
 - app/views/layouts/_messages.html.erb
 - app/views/layouts/_mixed_results.erb
@@ -539,6 +562,7 @@ files:
 - 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/_terms_acceptance_disclaimer.html.erb
 - app/views/layouts/_test_results.html.erb
 - app/views/layouts/_timer.html.erb
 - app/views/layouts/application.html.erb
@@ -576,6 +600,9 @@ files:
 - app/views/layouts/modals/_kids_context.html.erb
 - app/views/layouts/modals/_kids_results.html.erb
 - app/views/layouts/modals/_kids_results_aborted.html.erb
+- app/views/layouts/modals/_kindergarten_context.html.erb
+- app/views/layouts/modals/_kindergarten_results.html.erb
+- app/views/layouts/modals/_kindergarten_results_aborted.html.erb
 - app/views/layouts/modals/_new_message.html.erb
 - app/views/lessons/show.html.erb
 - app/views/messages/errors.html.erb
@@ -590,9 +617,11 @@ files:
 - app/views/users/_avatar_list.html.erb
 - app/views/users/_edit_user_form.html.erb
 - app/views/users/_profile_fields.html.erb
+- app/views/users/_term.html.erb
 - app/views/users/_user_form.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/show.html.erb
+- app/views/users/terms.html.erb
 - config/i18n-tasks.yml
 - config/initializers/form_builder.rb
 - config/initializers/omniauth.rb
@@ -694,6 +723,7 @@ files:
 - spec/dummy/public/error/timeout_1.svg
 - spec/dummy/public/error/timeout_2.svg
 - spec/dummy/public/error/timeout_3.svg
+- spec/dummy/public/medal/outline.svg
 - spec/evaluation_helper.rb
 - spec/features/chapter_spec.rb
 - spec/features/choose_organization_spec.rb
@@ -737,6 +767,7 @@ files:
 - spec/javascripts/elipsis-spec.js
 - spec/javascripts/events-spec.js
 - spec/javascripts/exercise-spec.js
+- spec/javascripts/gamification-spec.js
 - spec/javascripts/global-spec.js
 - spec/javascripts/results-renderers-spec.js
 - spec/javascripts/spec-helper.js
@@ -851,6 +882,7 @@ test_files:
 - spec/dummy/bin/rails
 - spec/dummy/bin/setup
 - spec/dummy/public/character/animations.json
+- spec/dummy/public/medal/outline.svg
 - spec/dummy/public/error/timeout_2.svg
 - spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/401.svg
@@ -900,6 +932,7 @@ test_files:
 - spec/javascripts/events-spec.js
 - spec/javascripts/exercise-spec.js
 - spec/javascripts/global-spec.js
+- spec/javascripts/gamification-spec.js
 - spec/javascripts/speech-bubble-renderer-spec.js
 - spec/javascripts/timeout-spec.js
 - spec/javascripts/results-renderers-spec.js