mumuki-laboratory 7.12.1 → 8.1.2

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

@@ -101,6 +101,7 @@ es:
   exercise_success_rate: Tasa de éxito en ejercicios
   exercises: Ejercicios
   exit: Salir
+  exp_points: puntos de experiencia.
   expectations: Objetivos
   expected_state: Tablero esperado
   explain_redirect: Notamos que te registraste en otra organización.
@@ -111,8 +112,8 @@ es:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms: Reglas del foro
-  forum_terms_link: Si tenés alguna duda, consultá las %{terms_link}
+  forum_terms: Reglas del espacio de consultas
+  forum_terms_link: Si tenés alguna duda, accedé a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -155,6 +156,8 @@ es:
   lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avisanos!
+  level: Nivel
+  level_up: ¡Subiste de nivel!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -255,6 +258,7 @@ es:
     other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resolvé consultas
+  solve_more_exercises_to_level_up: Resolvé <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consultá tus dudas
   solve_your_doubts_teaser: ¿Tenés alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
@@ -317,6 +321,7 @@ es:
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
   years: años
+  you_earned: Ganaste
   you_must_sign_in_before_submitting: Tenés que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.
   your_new_organization: tu nueva organización

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

@@ -97,6 +97,7 @@ pt:
   exercise_success_rate: Taxa de sucesso em exercícios
   exercises: Exercícios
   exit: Sair
+  exp_points: pontos de experiência.
   expectations: Objetivos
   expected_state: Tabuleiro esperado
   explain_redirect: Percebemos que você se registrou em outra organização.
@@ -107,7 +108,7 @@ pt:
   first_name: Nome
   forbidden_explanation: Você poderia ter entrado com uma conta incorreta?
   format: Formato
-  forum_terms: Regras do fórum
+  forum_terms: Regras do espaço de consulta
   forum_terms_link: Se você tiver alguma dúvida, consulte as %{terms_link}
   fullscreen: Tela completa
   gender: Gênero
@@ -149,6 +150,8 @@ pt:
   lessons: Lições
   lesson_number: Lição %{number}
   let_us_know: Por favor, avise-nos!
+  level: Nível
+  level_up: Você sobe de nível!
   loading: Carregando
   load_solution_into_console: Carregue a solução no console
   locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores'
@@ -242,6 +245,7 @@ pt:
   solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
   solve_doubts: Resolvi dúvidas
+  solve_more_exercises_to_level_up: Resolva mais <span>number</span> exercícios para avançar para o próximo nível.
   solve_your_doubts: Consulte suas dúvidas
   solve_your_doubts_teaser: Você tem alguma dúvida?
   something_went_wrong: Oops!, Algo não estava certo ...
@@ -292,5 +296,6 @@ pt:
   working: Processamento
   wrong_answer: A resposta não é correta
   years: anos
+  you_earned: Você ganhou
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
   your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.12.1'
+    VERSION = '8.1.2'
   end
 end

data/spec/capybara_helper.rb

@@ -87,7 +87,11 @@ def exclude_selenium_failing_tests!
       :json_eq_error,
       :navigation_error,
       :organization_not_nil,
-      :xpath_no_matches
+      :xpath_no_matches,
+
+      # Fails because Rails redirection doesn't include Capybara port.
+      # It can be fixed by using path mapping instead of subdomain.
+      :subdomain_redirection_without_port
     )
   end
 end

data/spec/controllers/discussions_controller_spec.rb

@@ -26,6 +26,25 @@ describe DiscussionsController, organization_workspace: :test do
     end
   end
 
+  describe 'index' do
+    context 'when user is banned from forum' do
+      before { user.update! banned_from_forum: true }
+      before { get :index, params: exercise_params }
+
+      it { expect(response.status).to eq 404 }
+    end
+
+    context 'when user has exam in progress' do
+      let!(:exam) { create(:exam) }
+      before { exam.authorize! user }
+      before { exam.start! user }
+
+      before { get :index, params: exercise_params }
+
+      it { expect(response.status).to eq 403 }
+    end
+  end
+
   describe 'post' do
     before { allow_any_instance_of(DiscussionsController).to receive(:discussion_params).and_return title: 'A title' }
     before { post :create, params: exercise_params }

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -89,7 +89,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
                                             except: [:html, :remaining_attempts_html, :title_html, :button_html,
-                                                     :expectations, :test_results, :tips, :current_exp]) }
+                                                     :expectations, :test_results, :tips, :current_exp, :level_up_html]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)

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: 20201027152806) do
+ActiveRecord::Schema.define(version: 20201130163114) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -433,6 +433,7 @@ ActiveRecord::Schema.define(version: 20201027152806) do
     t.datetime "privacy_terms_accepted_at"
     t.datetime "legal_terms_accepted_at"
     t.datetime "forum_terms_accepted_at"
+    t.boolean "banned_from_forum"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

data/spec/features/immersive_redirection_spec.rb

@@ -0,0 +1,181 @@
+require 'spec_helper'
+
+feature 'Immersive redirection Flow', organization_workspace: :test, subdomain_redirection_without_port: true do
+  def create_guide(name)
+    create(:guide, name: name)
+  end
+
+  def create_immersive_organization(name, guides)
+    create(:organization,
+           name: name,
+           immersive: true,
+           book:
+               create(:book,
+                      chapters: [
+                          create(:chapter, lessons: guides.map { |it| create(:lesson, guide: it) })
+                      ]))
+  end
+
+  let(:organization) { Organization.current }
+  let(:book) { organization.book }
+
+  let(:guide_one) { create_guide 'guide one' }
+  let(:guide_two) { create_guide 'guide two' }
+  let(:guide_three) { create_guide 'guide three' }
+
+  let(:lesson_one) { create(:lesson, guide: guide_one) }
+  let(:lesson_two) { create(:lesson, guide: guide_two) }
+  let(:lesson_three) { create(:lesson, guide: guide_three) }
+
+  before { book.update! chapters: [create(:chapter, lessons: [lesson_one, lesson_two, lesson_three])] }
+  before { set_current_user! user }
+
+  shared_examples 'immersive redirection' do |organization_name|
+    scenario 'should redirect to immersive organization' do
+      expect(page).to have_text organization_name
+      expect(page).not_to have_text "Go to #{organization_name}"
+    end
+  end
+
+  shared_examples 'navigate to content' do |guide_name|
+    scenario 'should navigate to content' do
+      expect(page).to have_text guide_name
+      expect(page).to have_text 'Exercises'
+    end
+  end
+
+  shared_examples 'navigate to main page' do
+    scenario 'should navigate to main page' do
+      expect(page).to have_text 'Start Practicing!'
+    end
+  end
+
+  shared_examples 'navigate to discussions main page' do
+    scenario 'should navigate to discussions main page' do
+      expect(page).to have_text 'Discussions'
+    end
+  end
+
+  shared_examples 'navigate to user profile' do
+    scenario 'should navigate to user profile' do
+      expect(page).to have_text user.full_name
+    end
+  end
+
+  context 'with one immersive organization' do
+    let(:user) { create(:user, permissions: {student: 'immersive-orga/*'}) }
+    let!(:immersive_orga) { create_immersive_organization('immersive-orga', [guide_one]) }
+
+    feature 'when navigating to an available content' do
+      before { visit lesson_path(lesson_one) }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to content', 'guide one'
+    end
+
+    feature 'when navigating to an unavailable content' do
+      before { visit lesson_path(lesson_two) }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to main page'
+    end
+
+    context 'when navigating to a discussion' do
+      feature 'and forum enabled' do
+        before { immersive_orga.update(forum_enabled: true) }
+        before { visit discussions_path }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to discussions main page'
+      end
+
+      feature 'and forum not enabled' do
+        before { visit discussions_path }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+
+    feature 'when navigating to another route' do
+      before { visit user_path }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to user profile'
+    end
+  end
+
+  context 'with many immersive organizations' do
+    let(:user) { create(:user, permissions: {student: 'immersive-orga/*:private/*'}) }
+
+    let!(:private_orga) { create_immersive_organization('private', [guide_one, guide_two]) }
+    let!(:immersive_orga) { create_immersive_organization('immersive-orga', [guide_one]) }
+
+    shared_examples 'organization chooser' do
+      scenario 'should display organization chooser' do
+        expect(page).to have_text 'You have registered in another organization'
+      end
+    end
+
+    def choose_organization(name)
+      within '.modal' do
+        click_on "Go to #{name}"
+      end
+    end
+
+    feature 'when content is present in one of them' do
+      before { visit lesson_path(lesson_two) }
+      it_behaves_like 'immersive redirection', 'private'
+      it_behaves_like 'navigate to content', 'guide two'
+    end
+
+    feature 'when content is present in two of them' do
+      before { visit lesson_path(lesson_one) }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'private' }
+        it_behaves_like 'immersive redirection', 'private'
+        it_behaves_like 'navigate to content', 'guide one'
+      end
+    end
+
+    describe 'when content is not present on any of them' do
+      before { visit lesson_path(lesson_three) }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'immersive-orga' }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+
+    feature 'when navigating to another route' do
+      before { visit user_path }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'immersive-orga' }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to user profile'
+      end
+    end
+
+    context 'when navigating to a discussion' do
+      before { immersive_orga.update(forum_enabled: true) }
+      before { visit discussions_path }
+
+      it_behaves_like 'organization chooser'
+
+      feature 'and forum enabled' do
+        before { choose_organization 'immersive-orga' }
+
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to discussions main page'
+      end
+
+      feature 'and forum not enabled' do
+        before { choose_organization 'private' }
+
+        it_behaves_like 'immersive redirection', 'private'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+  end
+end

data/spec/features/profile_flow_spec.rb

@@ -5,10 +5,9 @@ feature 'Profile Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
-        build(:lesson, name: 'Values and Functions', language: haskell, description: 'Values are everywhere...', exercises: [
-            build(:exercise, name: 'The Basic Values', description: "Let's say we want to declare a variable...")
-        ])
+        build(:lesson, name: 'Values and Functions', language: haskell, description: 'Values are everywhere...', exercises: [exercise])
     ]) }
+  let(:exercise) { build(:exercise, name: 'The Basic Values', description: "Let's say we want to declare a variable...") }
   let(:problem) { create :problem}
   let(:message) {
     {'exercise_id' => problem.id,
@@ -71,6 +70,39 @@ feature 'Profile Flow', organization_workspace: :test do
   context 'logged in user' do
     before { set_current_user! user }
 
+    context 'user with uncompleted profile after saving' do
+      before { user.update! last_name: 'last_name', birthdate: Time.now - 20.years, gender: 'female' }
+
+      let(:button_options) do
+        # Match :first is used because there are two buttons: mobile and desktop.
+        { class: 'mu-edit-profile-btn', match: :first }.tap do |options|
+          options.merge!(disabled: true) unless run_with_selenium?
+        end
+      end
+
+      context 'when visiting an exercise' do
+        scenario 'is redirected to previous path' do
+          visit "/exercises/#{exercise.transparent_id}"
+          fill_in('user_first_name', with: 'first_name')
+
+          click_on(button_options)
+          expect(page).to have_text(exercise.description)
+        end
+      end
+
+      context 'when visiting profile edition' do
+        scenario 'is redirected to read only profile' do
+          visit "/user/edit"
+          fill_in('user_first_name', with: 'first_name')
+
+          # Match :first is used because there are two buttons: mobile and desktop.
+          click_on(button_options)
+          expect(page).to have_text('Your data was updated successfuly')
+          expect(page).to have_text('Profile')
+        end
+      end
+    end
+
     context 'with no messages' do
 
       scenario 'visit messages tab' do

data/spec/features/terms_flow_spec.rb

@@ -0,0 +1,155 @@
+require 'spec_helper'
+
+feature 'Terms Flow', organization_workspace: :test do
+  let(:forum_terms_scopes) { Term::FORUM_RELATED }
+  let(:general_terms_scopes) { Term::GENERAL }
+  let(:role_terms_scopes) { Term::ROLE_SPECIFIC }
+
+  let(:all_terms_scopes) { forum_terms_scopes + general_terms_scopes + role_terms_scopes }
+  let!(:terms) { all_terms_scopes.map { |it| create(:term, scope: it, locale: Organization.current.locale) } }
+
+  let(:test_organization) { Organization.locate!("test") }
+
+  let!(:exercise) { create(:indexed_exercise) }
+  let(:expected_terms) { [] }
+  let(:unexpected_terms) { all_terms_scopes - expected_terms }
+
+  let(:student) { create(:user, uid: 'user.student@mumuki.org', permissions: {student: 'test/*'}) }
+
+  let(:janitor) { create(:user, uid: 'user.janitor@mumuki.org', permissions: {student: 'test/*', janitor: 'other/*'}) }
+
+  before { reindex_current_organization! }
+
+  shared_context 'has expected terms' do
+    scenario 'with expected terms' do
+      visit terms_path
+
+      expected_terms.each do |it|
+        expect(page).to have_text(Term.find_by(scope: it).content)
+      end
+
+      unexpected_terms.each do |it|
+        expect(page).not_to have_text(Term.find_by(scope: it).content)
+      end
+    end
+  end
+
+  context 'with student logged in' do
+    before { set_current_user! student }
+
+    describe 'visit user terms path' do
+      let(:terms_path) { '/user/terms' }
+      let(:expected_terms) { general_terms_scopes }
+
+      it_behaves_like 'has expected terms'
+    end
+
+    context 'visit forum' do
+      let(:terms_path) { '/discussions/terms' }
+
+      context 'with disabled forum' do
+
+        it_behaves_like 'has expected terms'
+      end
+
+      context 'with enabled forum' do
+        let(:expected_terms) { forum_terms_scopes }
+        before { test_organization.update! forum_enabled: true }
+
+        it_behaves_like 'has expected terms'
+      end
+    end
+  end
+
+  context 'with janitor logged in' do
+    before { set_current_user! janitor }
+
+    describe 'visit user terms path' do
+      let(:terms_path) { '/user/terms' }
+      let(:expected_terms) { general_terms_scopes + %w(janitor) }
+
+      it_behaves_like 'has expected terms'
+    end
+
+    context 'with accepted general terms' do
+      before { janitor.accept_profile_terms! }
+
+      context 'visit forum' do
+        let(:terms_path) { '/discussions/terms' }
+
+        context 'with enabled forum' do
+          let(:expected_terms) { forum_terms_scopes }
+          before { test_organization.update! forum_enabled: true }
+
+          it_behaves_like 'has expected terms'
+        end
+      end
+
+      scenario 'visit any other path' do
+        visit '/'
+
+        expect(page).to have_text('Start Practicing')
+      end
+    end
+
+    context 'with unaccepted role terms' do
+
+      context 'visit forum' do
+        let(:terms_path) { '/discussions/terms' }
+        before { test_organization.update! forum_enabled: true }
+
+        scenario 'with enabled forum' do
+          visit '/discussions'
+          expect(page).to have_text('Accept terms')
+
+          click_on 'Accept'
+          expect(page).to have_text('Discussions')
+        end
+      end
+
+      scenario 'visit any other path' do
+        visit '/'
+        expect(page).to have_text('Accept terms')
+
+        click_on 'Accept'
+        expect(page).to have_text(test_organization.book.name)
+      end
+
+      scenario 'visit user path' do
+        visit '/user'
+
+        expect(page).to have_text(janitor.first_name)
+      end
+    end
+  end
+
+  context 'without user logged in' do
+    describe 'visit user terms path' do
+      let(:terms_path) { '/user/terms' }
+      let(:expected_terms) { general_terms_scopes }
+
+      it_behaves_like 'has expected terms'
+    end
+
+    scenario 'visit any other path' do
+      visit '/'
+
+      expect(page).to have_text('Start Practicing')
+    end
+
+    context 'visit forum' do
+      let(:terms_path) { '/discussions/terms' }
+
+      context 'with enabled forum' do
+        before { test_organization.update! forum_enabled: true }
+
+        scenario 'visit forum' do
+          visit '/discussions/terms'
+          expect(page).to have_text('You may have mistyped the address or the page may have moved')
+        end
+      end
+    end
+  end
+
+end
+