mumuki-laboratory 7.7.6 → 7.8.0

data/spec/javascripts/editors-spec.js

@@ -0,0 +1,54 @@
+describe('editors', () => {
+
+  beforeEach(() => {
+    mumuki.CustomEditor.clearSources()
+  })
+
+  it('has initially no sources', () => {
+    expect(mumuki.CustomEditor.hasSources).toBe(false)
+  });
+
+  it('can add a custom source', () => {
+    mumuki.editors.addCustomSource({
+      getContent() {
+        return { name: "solution[content]", value: 'the value' } ;
+      }
+    });
+
+    expect(mumuki.CustomEditor.hasSources).toBe(true);
+    expect(mumuki.CustomEditor.getContents()[0].value).toEqual('the value');
+    expect(mumuki.CustomEditor.getContents()[0].name).toEqual('solution[content]');
+  });
+
+  it('reads the custom sources if present, ignoring the form', () => {
+    $('body').html(`
+    <form role="form" class="new_solution">
+      <div class="field form-group editor-code">
+        <textarea class="form-control editor" name="solution[content]" id="solution_content">the standard solution</textarea>
+      </div>
+    </form>`)
+
+    mumuki.editors.addCustomSource({
+      getContent() {
+        return { name: "solution[content]", value: 'the custom solution' } ;
+      }
+    });
+
+    expect(mumuki.editors.getSubmission()).toEqual({"solution[content]":"the custom solution"});
+  });
+
+  it('reads the form if no sources', () => {
+    $('body').html(`
+    <form role="form" class="new_solution">
+      <div class="field form-group editor-code">
+        <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"});
+  });
+
+  it('produces empty submission if no form nor sources', () => {
+    $('body').html(``);
+    expect(mumuki.editors.getSubmission()).toEqual({});
+  });
+})

data/spec/javascripts/exercise-spec.js

@@ -0,0 +1,22 @@
+describe('exercise', () => {
+  it('current exercise information is available when present', () => {
+    $('body').html(`
+    <input type="hidden" name="mu-exercise-id" id="mu-exercise-id" value="3361" />
+    <input type="hidden" name="mu-exercise-layout" id="mu-exercise-layout" value="input_right" />`)
+
+    mumuki.exercise.load()
+
+    expect(mumuki.exercise.id).toBe(3361);
+    expect(mumuki.exercise.layout).toBe('input_right');
+  })
+
+  it('current exercise information is available when not present', () => {
+    $('body').html(``)
+
+    mumuki.exercise.load()
+
+    expect(mumuki.exercise.id).toBe(null);
+    expect(mumuki.exercise.layout).toBe(null);
+  })
+
+})

data/spec/javascripts/global-spec.js

@@ -0,0 +1,6 @@
+describe("global loading", () => {
+  it("produces no global loading errors", () => {
+    const error = window['__globalLoadingError__'];
+    expect(!error).toBe(true, `Expected no global loading errors but got ${error && error.message}`)
+  })
+})

data/spec/javascripts/spec-helper.js

@@ -28,3 +28,7 @@
 // the configuration and use this file as a manifest.
 //
 // For more information: http://github.com/modeset/teaspoon
+
+window.addEventListener("error", (e) => {
+  window['__globalLoadingError__'] = e;
+});

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

@@ -0,0 +1,44 @@
+describe("SubmissionsStore", () => {
+  const emptyProgramSubmission = {"solution[content]": "program {}"};
+  /** @type {SubmissionResult} */
+  const passedSubmissionResult = {status: 'passed'};
+  /** @type {SubmissionAndResult} */
+  const passedEmptyProgramSubmissionAndResult = { submission: emptyProgramSubmission, result: passedSubmissionResult };
+
+  beforeEach(() => {
+    window.localStorage.clear()
+  });
+
+  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)
+    })
+  });
+})

data/spec/javascripts/sync-mode-spec.js

@@ -0,0 +1,15 @@
+describe('sync mode', () => {
+  it('can choose server mode', () => {
+    mumuki.incognitoUser = false;
+    mumuki.syncMode._selectSyncMode();
+
+    expect(mumuki.syncMode._current instanceof mumuki.syncMode.ServerSyncMode).toBe(true);
+  })
+
+  it('can choose local mode', () => {
+    mumuki.incognitoUser = true;
+    mumuki.syncMode._selectSyncMode();
+
+    expect(mumuki.syncMode._current instanceof mumuki.syncMode.ClientSyncMode).toBe(true);
+  })
+})

data/spec/mailers/user_mailer_spec.rb

@@ -148,21 +148,21 @@ RSpec.describe UserMailer, type: :mailer do
 
       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") }
+        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") }
+        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") }
+        it { expect(reminder.body.encoded).to include('you've never submitted solutions') }
       end
 
       context "last submission 4 weeks ago" do
@@ -178,4 +178,19 @@ RSpec.describe UserMailer, type: :mailer do
       it { expect(user.should_remind?).to be false }
     end
   end
+
+  describe 'welcome email' do
+    let(:email) { UserMailer.welcome_email(user, organization) }
+
+    let(:non_custom_welcome_orga) { create :organization }
+    let(:custom_welcome_orga) { create :organization, welcome_email_template: 'hello <%= @user.first_name %>!' }
+
+    let(:user) { create :user, first_name: 'some name' }
+    
+    context 'when organization does have a custom welcome template' do
+      let(:organization) { custom_welcome_orga }
+
+      it { expect(email.body.encoded).to eq 'hello some name!' }
+    end
+  end
 end

data/spec/teaspoon_env.rb

@@ -3,6 +3,8 @@ unless defined?(Rails)
   require File.expand_path("../dummy/config/environment", __FILE__)
 end
 
+# Enable this line for more verbose debugging
+# Selenium::WebDriver.logger.level = :debug
 
 Teaspoon.configure do |config|
   # Determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
@@ -106,8 +108,12 @@ 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}
-
+  config.driver_options = {
+    client_driver: :firefox,
+     selenium_options: {
+      options: Selenium::WebDriver::Firefox::Options.new(log_level: :warn)
+    }
+  }
 
   # 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.

data/vendor/assets/javascripts/codemirror-modes/gobstones.js

@@ -2,7 +2,6 @@
 
 (function() {
   var locale = document.querySelector("html").lang || 'es';
-  var languageCode = locale.split("-")[0];
 
   var keywords = [
     "program", "procedure", "function", "interactive", "if",
@@ -23,8 +22,8 @@
     en: ["Put", "Grab", "Move", "GoToEdge", "EmptyBoardContents", "numStones", "anyStones", "canMove", "next", "prev", "opposite", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"]
   };
 
-  const localizedKeywordsAndBuiltins = keywords.concat(builtins[languageCode]);
-  const localizedAtoms = atoms[languageCode];
+  const localizedKeywordsAndBuiltins = keywords.concat(builtins[locale]);
+  const localizedAtoms = atoms[locale];
 
   var buildList = function(values) {
     return values.join('|');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.7.6
+  version: 7.8.0
 platform: ruby
 authors:
 - Franco Bulgarelli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.7.3
+        version: 7.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.7.3
+        version: 7.8.1
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +344,9 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/csrf-token.js
 - app/assets/javascripts/mumuki_laboratory/application/custom-editor.js
 - app/assets/javascripts/mumuki_laboratory/application/discussions.js
+- app/assets/javascripts/mumuki_laboratory/application/editors.js
 - app/assets/javascripts/mumuki_laboratory/application/elipsis.js
+- app/assets/javascripts/mumuki_laboratory/application/exercise.js
 - app/assets/javascripts/mumuki_laboratory/application/free-form.js
 - app/assets/javascripts/mumuki_laboratory/application/inputs.js
 - app/assets/javascripts/mumuki_laboratory/application/interval.js
@@ -361,6 +363,8 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/results-renderer.js
 - app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js
 - app/assets/javascripts/mumuki_laboratory/application/submission.js
+- app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
+- app/assets/javascripts/mumuki_laboratory/application/sync-mode.js
 - app/assets/javascripts/mumuki_laboratory/application/timer.js
 - app/assets/javascripts/mumuki_laboratory/application/tooltip.js
 - app/assets/javascripts/mumuki_laboratory/application/upload.js
@@ -461,9 +465,9 @@ files:
 - app/helpers/editor_tabs_helper.rb
 - app/helpers/email_helper.rb
 - app/helpers/exercise_input_helper.rb
+- app/helpers/globals_helper.rb
 - app/helpers/icons_helper.rb
 - app/helpers/links_helper.rb
-- app/helpers/locale_helper.rb
 - app/helpers/menu_bar_helper.rb
 - app/helpers/messages_helper.rb
 - app/helpers/multiple_file_editor_helper.rb
@@ -475,7 +479,6 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
-- app/helpers/version_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
 - app/views/appendixes/show.html.erb
@@ -595,6 +598,7 @@ files:
 - lib/mumuki/laboratory/controllers/dynamic_errors.rb
 - lib/mumuki/laboratory/controllers/embedded_mode.rb
 - lib/mumuki/laboratory/controllers/exercise_seed.rb
+- lib/mumuki/laboratory/controllers/incognito_mode.rb
 - lib/mumuki/laboratory/controllers/nested_in_exercise.rb
 - lib/mumuki/laboratory/controllers/notifications.rb
 - lib/mumuki/laboratory/controllers/results_rendering.rb
@@ -719,10 +723,15 @@ files:
 - spec/helpers/with_navigation_spec.rb
 - spec/javascripts/bridge-spec.js
 - spec/javascripts/csrf-token-spec.js
+- spec/javascripts/editors-spec.js
 - spec/javascripts/elipsis-spec.js
+- spec/javascripts/exercise-spec.js
+- spec/javascripts/global-spec.js
 - spec/javascripts/results-renderers-spec.js
 - spec/javascripts/spec-helper.js
 - spec/javascripts/speech-bubble-renderer-spec.js
+- spec/javascripts/submissions-store-spec.js
+- spec/javascripts/sync-mode-spec.js
 - spec/javascripts/timeout-spec.js
 - spec/javascripts/timer-spec.js
 - spec/login_helper.rb
@@ -876,13 +885,18 @@ test_files:
 - spec/capybara_helper.rb
 - spec/evaluation_helper.rb
 - spec/javascripts/bridge-spec.js
+- spec/javascripts/exercise-spec.js
+- spec/javascripts/global-spec.js
 - spec/javascripts/speech-bubble-renderer-spec.js
 - spec/javascripts/timeout-spec.js
 - spec/javascripts/results-renderers-spec.js
 - spec/javascripts/csrf-token-spec.js
 - spec/javascripts/elipsis-spec.js
 - spec/javascripts/timer-spec.js
+- spec/javascripts/editors-spec.js
 - spec/javascripts/spec-helper.js
+- spec/javascripts/submissions-store-spec.js
+- spec/javascripts/sync-mode-spec.js
 - spec/controllers/discussions_controller_spec.rb
 - spec/controllers/chapters_controller_spec.rb
 - spec/controllers/students_api_controller_spec.rb

data/app/helpers/version_helper.rb

@@ -1,5 +0,0 @@
-module VersionHelper
-  def version_tags
-    %Q{<script type="text/javascript">mumuki.version = '#{Mumuki::Laboratory::VERSION}';</script>}.html_safe
-  end
-end