mumuki-laboratory 7.7.6 → 7.10.0

data/lib/mumuki/laboratory/locales/pt.yml

@@ -7,6 +7,7 @@ pt:
   actions: Ações
   activity: Atividade
   actual_state: Tablero obtido
+  age: Idade
   all: Todos
   and: e
   appendix: Apêndice
@@ -29,10 +30,12 @@ pt:
   bibliotheca_ui: Biblioteca
   birthdate: Fecha de nacimiento
   blocked_forum_explanation: Você não tem permissão para ver este conteúdo. <br> Você está no meio de um exame agora?
+  cancel: Cancelar
   chapter: Capítulo
   chapters: Capítulos
   chapter_finished_html: Você terminou %{chapter}! Parabéns!
   chapter_number: Capítulo %{number}
+  choose_your_avatar: Escolha seu avatar
   classroom_ui: Sala de aula
   clear_console: Reiniciar o console
   closed: Fechado
@@ -68,6 +71,7 @@ pt:
   discussions: Consultas
   download: Faça o download do que você fez
   edit: Editar
+  edit_profile: Editar perfil
   editor_placeholder: ... Escreva sua solução aqui ...
   email: E-mail
   error_description: Opa! <br> Isto é o que é conhecido como <span class = "error-link"> %{error} </ span>.
@@ -171,6 +175,7 @@ pt:
   not_in_any_organizations: Parece que você ainda não está em nenhuma organização!
   notify_problem_with_exercise: Relatar um erro
   office: Secretariado
+  only_landscape_support: Por favor, gire seu tablet ou celular para realizar exercícios
   opened: Aberto
   opened_count: '%{count} aberto'
   organizations: Organizações
@@ -194,6 +199,7 @@ pt:
   processing_your_solution: Estamos processando sua solução
   profile: Perfil
   profile_of: Perfil de %{username}
+  programming_since: Sou programador
   progress: Progresso
   read: Ler
   read_messages: Ver mensagens
@@ -240,6 +246,7 @@ pt:
   submissions_for: Soluções para %{exercise}
   subscribe: se inscrever
   tag: Etiquetas
+  task: Tarefa
   teacher_info: Informação para professores
   tell_us_how: Conte-nos como isso aconteceu com você!
   tell_us_if_our_error: Se você acha que é nosso erro, %{issues}
@@ -265,8 +272,9 @@ pt:
   username: Nome de usuário
   view_details: Ver detalhes
   want_permissions: O próximo usuário requer permissões
+  welcome: Convidamos você a {name}!
   working: Processamento
   wrong_answer: A resposta não é correta
+  years: anos
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
-  task: Tarefa
-  only_landscape_support: Por favor, gire seu tablet ou celular para realizar exercícios
+  your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.7.6'
+    VERSION = '7.10.0'
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20200731081757) do
+ActiveRecord::Schema.define(version: 20200804191643) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(version: 20200731081757) do
     t.bigint "organization_id"
     t.datetime "submitted_at"
     t.bigint "parent_id"
+    t.integer "top_submission_status"
     t.index ["exercise_id"], name: "index_assignments_on_exercise_id"
     t.index ["organization_id"], name: "index_assignments_on_organization_id"
     t.index ["parent_id"], name: "index_assignments_on_parent_id"
@@ -54,6 +55,7 @@ ActiveRecord::Schema.define(version: 20200731081757) do
   create_table "avatars", force: :cascade do |t|
     t.string "image_url"
     t.string "description"
+    t.integer "target_audience", default: 0
   end
 
   create_table "books", id: :serial, force: :cascade do |t|
@@ -309,6 +311,8 @@ ActiveRecord::Schema.define(version: 20200731081757) do
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
     t.integer "progressive_display_lookahead"
+    t.integer "target_audience", default: 0
+    t.boolean "incognito_mode_enabled"
     t.index ["book_id"], name: "index_organizations_on_book_id"
     t.index ["name"], name: "index_organizations_on_name", unique: true
   end
@@ -363,6 +367,14 @@ ActiveRecord::Schema.define(version: 20200731081757) do
     t.index ["parent_item_type", "parent_item_id"], name: "index_usages_on_parent_item_type_and_parent_item_id"
   end
 
+  create_table "user_stats", force: :cascade do |t|
+    t.integer "exp", default: 0
+    t.bigint "user_id"
+    t.bigint "organization_id"
+    t.index ["organization_id"], name: "index_user_stats_on_organization_id"
+    t.index ["user_id"], name: "index_user_stats_on_user_id"
+  end
+
   create_table "users", id: :serial, force: :cascade do |t|
     t.string "provider"
     t.string "social_id"

data/spec/features/chapter_spec.rb

@@ -50,4 +50,21 @@ feature 'Chapters flow', organization_workspace: :test do
       expect(page).to have_text('endofunctors')
     end
   end
+
+  context 'incognito user' do
+    before { Organization.current.update! incognito_mode_enabled: true }
+    scenario 'show chapter, no appendix' do
+      visit "/chapters/#{chapter.id}"
+
+      expect(page).to have_text('Functional Programming')
+      expect(page).to have_text('The Basic Values')
+
+      expect(page).to have_text('Monads and Functors')
+      expect(page).to have_text('The Maybe Functor')
+
+      expect(page).to_not have_text('Appendix')
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end

data/spec/features/exercise_flow_spec.rb

@@ -9,12 +9,14 @@ feature 'Exercise Flow', organization_workspace: :test do
   let(:problem_1) { build(:problem, name: 'Succ1', description: 'Description of Succ1', layout: :input_right, hint: 'lala') }
   let(:problem_2) { build(:problem, name: 'Succ2', description: 'Description of Succ2', layout: :input_right, editor: :hidden, language: gobstones) }
   let(:problem_3) { build(:problem, name: 'Succ3', description: 'Description of Succ3', layout: :input_right, editor: :upload, hint: 'lele') }
-  let(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
+  let(:with_settings_and_extra) do
+    build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, settings: {foo: 1}, extra: 'x = 2')
+  end
   let(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
   let(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
   let(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', editor: :single_choice, choices: [{value: 'some choice', checked: true}]) }
-  let(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
-  let(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
+  let(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_bottom) }
+  let(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }
   let!(:exercise_not_in_path) { create :exercise }
   let(:kids_problem) { build(:problem, name: 'Kids prob', description: 'Description of kids prob', layout: :input_primary, hint: 'lele', language: gobstones) }
@@ -22,7 +24,7 @@ feature 'Exercise Flow', organization_workspace: :test do
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
       create(:lesson, name: 'getting-started', description: 'An awesome guide', language: haskell, exercises: [
-        problem_1, problem_2, problem_3, problem_4, reading, problem_5, problem_6, problem_7, playground_1, playground_2, kids_problem
+        problem_1, problem_2, problem_3, with_settings_and_extra, reading, problem_5, problem_6, problem_7, playground_1, playground_2, kids_problem
       ])
     ]) }
 
@@ -129,6 +131,12 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page).to have_selector('#mu-exercise-id', )
+      expect(page).to have_selector('#mu-exercise-layout')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_1.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, hidden layout, no hint, not queriable language' do
@@ -142,6 +150,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_2.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, hidden layout, no hint, queriable language' do
@@ -152,6 +163,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_6.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
 
@@ -163,6 +177,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to have_text('need a hint?')
       expect(page).to have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_3.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, upload layout, not queriable language' do
@@ -174,10 +191,13 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_selector('.upload')
       expect(problem_5.language.extension).to eq('gbs')
       expect(page.find("//div[@class = 'form-group']/input")['accept']).to eq(".gbs")
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_5.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
-    scenario 'visit exercise by id, input_bottom layout, extra, no hint' do
-      visit "/exercises/#{problem_4.id}"
+    scenario 'visit exercise by id, input_bottom layout, extra, setting, no hint' do
+      visit "/exercises/#{with_settings_and_extra.id}"
 
       expect(page).to have_text('Succ4')
       expect(page).to have_text('x = 2')
@@ -185,6 +205,10 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(with_settings_and_extra.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
+      expect(page.find("#mu-exercise-settings")['value']).to eq('{"foo":1}')
     end
 
     scenario 'visit playground by id, no extra, no hint' do
@@ -195,6 +219,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(playground_1.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit playground by id, with extra, no hint' do
@@ -206,6 +233,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('need a hint?')
       expect(page).to have_text('x = 4')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(playground_2.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit inner reading by id' do
@@ -218,6 +248,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(reading.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit solved choices exercise' do
@@ -246,4 +279,19 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_xpath("//a[@title='Edit']")
     end
   end
+
+  context 'incognito user' do
+    before { Organization.current.update! incognito_mode_enabled: true }
+
+    scenario 'visit exercise transparently' do
+      visit "/exercises/#{problem_1.transparent_id}"
+
+      expect(page).to have_text('Succ1')
+      expect(page).to have_text('Console')
+      expect(page).to have_text('need a hint?')
+      expect(page).to have_text('Description of Succ1')
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end

data/spec/features/home_public_flow_spec.rb

@@ -91,4 +91,20 @@ feature 'public org', organization_workspace: :test do
       expect(user.reload.last_organization).to eq current_organization
     end
   end
+
+  context 'incognito user' do
+    before { current_organization.update! incognito_mode_enabled: true }
+    scenario 'from inside' do
+      Capybara.current_session.driver.header 'Referer', 'http://google.com'
+
+      visit '/'
+
+      expect(page).to have_text('ム mumuki')
+      expect(page).to have_text('First Steps')
+      expect(page).to have_selector('.chapter', text: 'Functional Programming')
+      expect(page).to have_text(current_organization.book.name)
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end

data/spec/helpers/avatar_helper_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe AvatarHelper, organization_workspace: :test do
+  helper AvatarHelper
+
+  let(:user) { create(:user, avatar: kids_avatars.last) }
+
+  let(:kids_avatars) { create_list(:avatar, 4, target_audience: :kids) }
+  let!(:grown_ups_avatars) { create_list(:avatar, 3, target_audience: :grown_ups) }
+
+  let!(:kids_organization) { create(:organization, target_audience: :kids) }
+  let!(:grown_ups_organization) { create(:organization, target_audience: :grown_ups, name: 'for_grown_ups') }
+
+  describe 'avatars_for' do
+    context 'with avatar in same target audience as organization' do
+      before { kids_organization.switch! }
+      it { expect(avatars_for(user)).to eq kids_avatars }
+    end
+
+    context 'with avatar in different target audience as organization' do
+      before { grown_ups_organization.switch! }
+      it { expect(avatars_for(user)).to eq grown_ups_avatars + [user.avatar] }
+    end
+
+  end
+end

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/events-spec.js

@@ -0,0 +1,33 @@
+describe('events', () => {
+  beforeEach(() => {
+    mumuki.events.clear('foo');
+  });
+
+  it('is not called when it is not fired', () => {
+    mumuki.events.on('foo', (e) => {
+      fail(`should not be called, but got ${JSON.stringify(e)}`);
+    })
+  })
+
+  it('is not called when it is fired but not enabled', () => {
+    let fired = false;
+    mumuki.events.on('foo', (e) => {
+      fail(`should not be called, but got ${JSON.stringify(e)}`);
+      fired = true;
+    })
+    mumuki.events.fire('foo', 42);
+    expect(fired).toBe(false);
+  })
+
+  it('is called when it is fired and enabled', () => {
+    let fired = false;
+    mumuki.events.enable('foo');
+    mumuki.events.on('foo', (event) => {
+      expect(event).toEqual(42);
+      fired = true;
+    })
+
+    mumuki.events.fire('foo', 42);
+    expect(fired).toBe(true);
+  })
+})

data/spec/javascripts/exercise-spec.js

@@ -0,0 +1,41 @@
+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" />
+    <input type="hidden" name="mu-exercise-settings" id="mu-exercise-settings" value="{}" />`)
+
+    mumuki.exercise.load();
+
+    expect(mumuki.exercise.id).toBe(3361);
+    expect(mumuki.exercise.layout).toBe('input_right');
+    expect(mumuki.exercise.settings).toEqual({});
+    expect(mumuki.exercise.current).not.toBe(null);
+  })
+
+  it('current exercise information is available when present and settings are not empty', () => {
+    $('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" />
+    <input type="hidden" name="mu-exercise-settings" id="mu-exercise-settings" value="{&quot;game_framework&quot;:true}" />`)
+
+    mumuki.exercise.load();
+
+    expect(mumuki.exercise.id).toBe(3361);
+    expect(mumuki.exercise.layout).toBe('input_right');
+    expect(mumuki.exercise.settings.game_framework).toBe(true);
+    expect(mumuki.exercise.current).not.toBe(null);
+  })
+
+  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);
+    expect(mumuki.exercise.settings).toBe(null);
+    expect(mumuki.exercise.current).toBe(null);
+  })
+})