mumuki-laboratory 7.0.9 → 7.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d336ad84b2c7da871c2d197b57744ae45e798b637340bff530045c9077d720
-  data.tar.gz: 94191df5d2841b0465efbcbbbc5e3c60a54e52987b4f1bb280289324c0d79b27
+  metadata.gz: 6349a7c55b93be1880845776c5c017c104db3dc26bf627dd94c671851fe9eb14
+  data.tar.gz: 2ef2f62bd6d8cbe828e890fe8e98d3afd629b2b5818ad35bc39454a4de7ed3b8
 SHA512:
-  metadata.gz: 862002b05967676245a1dcf3ad992fb9fc8923bda4075019be80d58d9d16131f5df1c5bc2d6e306a4e72ddb4ddaa7ddc3b25b835a9e2d6f2a36057cff3e72643
-  data.tar.gz: abc1bb8c4fb6607aff0fe3f89dbea8dd1c676b71b6450b25a83179f8c211619ca240acfaf2ddfa39f060f01e9a89bea205ccd6db82ca26f35532b2266616a224
+  metadata.gz: d4f007aa20177f56d32d0a5c826edaf4ff21460725254fce5c659c70af869bd36e2e3a524a1b1dafead2efd59cdaddbdae155d5f11df3913865ec19ade0349dd
+  data.tar.gz: '039ca9904728e320b6d6064d2ad3f239d00265b7a115e3c551aa1d5f34ef2000fccf49ca3058a8aa262dc2ed27174d4e7e5bd9ff5b1b1a0fbc14916efdcba024'

data/app/controllers/invitations_controller.rb

@@ -1,4 +1,6 @@
 class InvitationsController < ApplicationController
+  include WithUserParams
+
   before_action :authenticate!
   before_action :set_invitation!
   before_action :set_user!
@@ -23,8 +25,8 @@ class InvitationsController < ApplicationController
     redirect_to Mumukit::Platform.laboratory.organic_url(@organization)
   end
 
-  def user_params
-    params.require(:user).permit(:name, :first_name, :last_name, :email)
+  def permissible_params
+    super + [:email, :name]
   end
 
   def set_invitation!

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.0.9'
+    VERSION = '7.0.10'
   end
 end

data/spec/controllers/invitations_controller_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe InvitationsController, type: :controller, organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  before { set_current_user! user }
+
+  describe 'when invitation does not exist' do
+    before { get :join, params: {code: 'foo123' } }
+
+    it { expect(response.status).to eq 404 }
+  end
+
+  describe 'when invitation exists' do
+    let(:organization) { Organization.current }
+    let(:course) { create(:course, slug: 'test/foo-1111', name: 'Generic Course', organization: organization) }
+    let!(:invitation) { create(:invitation, code: 'foo123', course: course ) }
+
+    before { get :join, params: {code: 'foo123', user: {first_name: 'new first_name', gender: 'female'} } }
+    before { user.reload }
+
+    it { expect(response.status).to eq 302 }
+    it { expect(user.first_name).to eq 'new first_name' }
+    it { expect(user.gender).to eq 'female' }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.0.9
+  version: 7.0.10
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -484,6 +484,7 @@ files:
 - spec/controllers/discussions_controller_spec.rb
 - spec/controllers/exercise_solutions_controller_spec.rb
 - spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
 - spec/controllers/organizations_api_controller_spec.rb
 - spec/controllers/students_api_controller_spec.rb
@@ -710,6 +711,7 @@ test_files:
 - spec/controllers/courses_api_controller_spec.rb
 - spec/controllers/confirmations_controller_spec.rb
 - spec/controllers/api_clients_controller.rb
+- spec/controllers/invitations_controller_spec.rb
 - spec/controllers/users_api_controller_spec.rb
 - spec/controllers/guide_progress_controller_spec.rb
 - spec/controllers/organizations_api_controller_spec.rb