mumuki-laboratory 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6896f137f401b7b8bb5dd0738e580438a7960eee6abb275b48391fe0a923241
-  data.tar.gz: eedc5012f387ccbd9ecfe02f4a5ff3a4395ee35b47a6a1ca6e1bee6902c37a71
+  metadata.gz: 35d6e7523373cf000fe2e8e35c96946dc5ddbd334567c7b22c7e9820ead7097f
+  data.tar.gz: 734d4681ae46c1390f2aefb86a176142016669fedc748ba8e101a85b80ebd230
 SHA512:
-  metadata.gz: 3ada54c64c5dd5322437da49812d4ff5b7559b6568a0a8812026018675e47b77f7d9c66bb8c16ff19103a7cd6fa93383a1c8ae62647ed548de79ce2dde080c40
-  data.tar.gz: 5a9ddca63b8d823111ce73dc5329b69c9a1a556b1427178afe6827e50209a22a38289b0f0c08679da7200c48b267e249393e534745e4eca4b638bb17716db12e
+  metadata.gz: 622309fc919269e770a944125a09ea39f5e54a03d4d7b520bc836a005040c424ef47f1f74726bcc5b70056a98fea6004723f9e9157d4a24417d8423bcc323495
+  data.tar.gz: 21afdd2eeba34d58e3333e3b957336d40be30418032342c99c3be7dc6d1cb84b2971e274601ba72c9cc87ef79f154fe4bc8d391a12084f9b9f75186d1faf44e6

data/app/controllers/concerns/users_controller_template.rb

@@ -1,5 +1,6 @@
 module UsersControllerTemplate
   extend ActiveSupport::Concern
+  include WithUserParams
 
   included do
     before_action :set_user!, only: [:show, :update]
@@ -13,8 +14,8 @@ module UsersControllerTemplate
     current_user.protect_permissions_assignment! user_params[:permissions], @user.permissions_was
   end
 
-  def user_params
-    params.require(:user).permit(:first_name, :last_name, :email, :image_url, permissions: Mumukit::Auth::Roles::ROLES)
+  def permissible_params
+    super + [:email, :image_url, permissions: Mumukit::Auth::Roles::ROLES]
   end
 
   def set_user!
@@ -24,5 +25,4 @@ module UsersControllerTemplate
   def set_new_user!
     @user = User.new user_params
   end
-
 end

data/app/controllers/concerns/with_user_params.rb

@@ -0,0 +1,11 @@
+module WithUserParams
+  extend ActiveSupport::Concern
+
+  def user_params
+    params.require(:user).permit(*permissible_params).to_h
+  end
+
+  def permissible_params
+    User.profile_fields
+  end
+end

data/app/controllers/users_controller.rb

@@ -1,4 +1,6 @@
 class UsersController < ApplicationController
+  include WithUserParams
+
   before_action :authenticate!
   before_action :set_user!
 
@@ -24,10 +26,6 @@ class UsersController < ApplicationController
   def validate_user_profile!
   end
 
-  def user_params
-    params.require(:user).permit(User.profile_fields)
-  end
-
   def set_user!
     @user = current_user
   end

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

@@ -86,7 +86,7 @@ en:
   forbidden_explanation: You are not allowed to see this content.
   gender: Gender
   go_to: 'Go to %{organization}'
-  gone_explanation: This exam is no longer available.
+  gone_explanation: This content is no longer available.
   guide: Guide
   guide_created: Guide created successfully
   guide_finished: You completed %{guide}!

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

@@ -94,7 +94,7 @@ es:
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
   gender: Género
   go_to: 'Ir a %{organization}'
-  gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este examen.
+  gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este contenido.
   guide: Lección
   guide_created: Guía creada exitosamente
   guide_finished: ¡Terminaste %{guide}!

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

@@ -91,7 +91,7 @@ pt:
   gender: Gênero
   get_messages: Ver mensagens
   go_to: Vá para %{organization}
-  gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse exame.
+  gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse conteúdo.
   guide: Lição
   guide_created: Guia criado com sucesso
   guide_finished: Você terminou %{guide}!

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.0.3'
+    VERSION = '7.0.4'
   end
 end

data/spec/controllers/guide_progress_controller_spec.rb

@@ -5,17 +5,36 @@ describe GuideProgressController, organization_workspace: :test do
 
   let(:exam_problem) { build(:problem) }
   let(:test_organization) { Organization.find_by_name('test') }
-  let(:exam) { create(:exam, organization: test_organization, guide: guide) }
-  let(:guide) { create(:guide, exercises: [exam_problem])}
-
-  before { exam.index_usage! test_organization }
-
-  before { reindex_current_organization! }
+  let(:exam) { create(:exam, organization: test_organization, guide: exam_guide) }
+  let(:lesson) { create(:lesson, guide: lesson_guide) }
 
   describe 'delete' do
     before { set_current_user! user }
-    before { delete :destroy, params: { guide_id: guide.id } }
 
-    it { expect(response.status).to eq 403 }
+    describe 'an exam guide progress' do
+      let(:exam_guide) { create(:guide, exercises: [exam_problem])}
+      before { exam.index_usage! test_organization }
+      before { reindex_current_organization! }
+      before { delete :destroy, params: { guide_id: exam_guide.id } }
+
+      it { expect(response.status).to eq 403 }
+    end
+
+    describe 'a lesson guide progress' do
+      let(:book) { create(:book,
+                          slug: 'mumuki/book',
+                          chapters: [
+                            create(:chapter,
+                                   slug: 'mumuki/topic1',
+                                   lessons: [lesson])]) }
+
+      let(:lesson_guide) { create(:guide, exercises: [exam_problem])}
+      before { test_organization.update! book: book }
+      before { lesson.index_usage! test_organization }
+      before { reindex_current_organization! }
+      before { delete :destroy, params: { guide_id: lesson_guide.id } }
+
+      it { expect(response.status).to eq 302 }
+    end
   end
 end

data/spec/features/exams_flow_spec.rb

@@ -51,7 +51,7 @@ feature 'Exams Flow', organization_workspace: :test do
     expect_any_instance_of(Exam).to receive(:enabled_for?).and_return(false)
     visit "/exams/#{exam.classroom_id}"
 
-    expect(page).to have_text('This exam is no longer available.')
+    expect(page).to have_text('This content is no longer available.')
   end
 
   scenario 'visit exercise for exam with no submission limits' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - app/controllers/concerns/users_controller_template.rb
 - app/controllers/concerns/with_authorization.rb
 - app/controllers/concerns/with_errors_filter.rb
+- app/controllers/concerns/with_user_params.rb
 - app/controllers/discussions_controller.rb
 - app/controllers/discussions_messages_controller.rb
 - app/controllers/exams_controller.rb