mumuki-laboratory 8.6.1 → 9.0.0

data/spec/dummy/db/schema.rb

@@ -71,6 +71,29 @@ ActiveRecord::Schema.define(version: 20210119190204) do
     t.index ["slug"], name: "index_books_on_slug", unique: true
   end
 
+  create_table "certificate_programs", force: :cascade do |t|
+    t.string "title"
+    t.string "template_html_erb"
+    t.text "description"
+    t.string "background_image_url"
+    t.bigint "organization_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["organization_id"], name: "index_certificate_programs_on_organization_id"
+  end
+
+  create_table "certificates", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "certificate_program_id"
+    t.datetime "start_date"
+    t.datetime "end_date"
+    t.string "code"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["certificate_program_id"], name: "index_certificates_on_certificate_program_id"
+    t.index ["user_id"], name: "index_certificates_on_user_id"
+  end
+
   create_table "chapters", id: :serial, force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"

data/spec/features/exercise_flow_spec.rb

@@ -106,19 +106,19 @@ feature 'Exercise Flow', organization_workspace: :test do
       scenario 'visit exercise by id, standalone mode' do
         visit "/exercises/#{problem_1.id}"
         expect(page).to have_text('Functional Programming 1')
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
       end
       scenario 'visit exercise by id, embedded mode in non embeddable organization' do
         visit "/exercises/#{problem_1.id}?embed=true"
         expect(page).to have_text('Functional Programming 1')
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
       end
       scenario 'visit exercise by id, embedded mode in embeddable organization' do
         Organization.current.tap { |it| it.embeddable = true }.save!
 
         visit "/exercises/#{problem_1.id}?embed=true"
         expect(page).to_not have_text('Functional Programming 1')
-        expect(page).to_not have_text('Profile')
+        expect(page).to_not have_text('My account')
       end
     end
 

data/spec/features/login_flow_spec.rb

@@ -64,6 +64,6 @@ feature 'Login Flow', organization_workspace: :test do
 
     expect(page).to_not have_text('Sign in')
     expect(page).to have_text('Sign Out')
-    expect(page).to have_text('Profile')
+    expect(page).to have_text('My profile')
   end
 end

data/spec/features/menu_bar_spec.rb

@@ -16,7 +16,7 @@ feature 'menu bar' do
       scenario 'should not see menu bar' do
         visit '/'
 
-        expect(page).not_to have_text('Profile')
+        expect(page).not_to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
       end
@@ -30,7 +30,7 @@ feature 'menu bar' do
       scenario 'should not see menu bar' do
         visit '/'
 
-        expect(page).not_to have_text('Profile')
+        expect(page).not_to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).not_to have_text('Solve other\'s doubts')
@@ -48,11 +48,11 @@ feature 'menu bar' do
     let(:admin) { create(:user, permissions: {student: 'private/*', admin: 'private/*'}) }
     let(:owner) { create(:user, permissions: {student: 'private/*', owner: 'private/*'}) }
 
-    scenario 'visitor should only see profile' do
+    scenario 'visitor should only see their account' do
       set_current_user! visitor
 
       visit '/'
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).not_to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
       expect(page).not_to have_text('Solve other\'s doubts')
@@ -60,23 +60,23 @@ feature 'menu bar' do
     end
 
     context 'student with no discussions should' do
-      scenario 'only see profile if forum is not enabled' do
+      scenario 'only see their account if forum is not enabled' do
         set_current_user! student
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).not_to have_text('Solve other\'s doubts')
         expect(page).not_to have_text('My doubts')
       end
 
-      scenario 'see profile and solve_other_doubts links if forum is enabled' do
+      scenario 'see their account and solve_other_doubts links if forum is enabled' do
         set_current_user! student
         private_organization.update! forum_enabled: true
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).to have_text('Solve other\'s doubts')
@@ -87,12 +87,12 @@ feature 'menu bar' do
     context 'student with discussions should' do
       let(:discussion) { create(:discussion, item: lesson.exercises.last, initiator: student)}
 
-      scenario 'only see profile if forum is not enabled' do
+      scenario 'only see their account if forum is not enabled' do
         set_current_user! student
         student.subscribe_to! discussion
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).not_to have_text('Solve other\'s doubts')
@@ -105,21 +105,21 @@ feature 'menu bar' do
         student.subscribe_to! discussion
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).to have_text('Solve other\'s doubts')
         expect(page).to have_text('My doubts')
       end
 
-      scenario 'only see profile if forum is enabled in a forum_only_for_trusted organization' do
+      scenario 'only see their account if forum is enabled in a forum_only_for_trusted organization' do
         set_current_user! student
         student.subscribe_to! discussion
         private_organization.update! forum_enabled: true
         private_organization.update! forum_only_for_trusted: true
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).not_to have_text('Solve other\'s doubts')
@@ -134,7 +134,7 @@ feature 'menu bar' do
         private_organization.update! forum_only_for_trusted: true
 
         visit '/'
-        expect(page).to have_text('Profile')
+        expect(page).to have_text('My account')
         expect(page).not_to have_text('Classroom')
         expect(page).not_to have_text('Bibliotheca')
         expect(page).to have_text('Solve other\'s doubts')
@@ -142,54 +142,54 @@ feature 'menu bar' do
       end
     end
 
-    scenario 'teacher should see profile and classroom' do
+    scenario 'teacher should see their account and classroom' do
       set_current_user! teacher
 
       visit '/'
 
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
       expect(page).not_to have_text('Solve other\'s doubts')
       expect(page).not_to have_text('My doubts')
     end
 
-    scenario 'writer should see profile and bibliotheca' do
+    scenario 'writer should see their account and bibliotheca' do
       set_current_user! writer
 
       visit '/'
 
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).not_to have_text('Classroom')
       expect(page).to have_text('Bibliotheca')
     end
 
-    scenario 'janitor should see profile and classroom' do
+    scenario 'janitor should see their account and classroom' do
       set_current_user! janitor
 
       visit '/'
 
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).to have_text('Classroom')
       expect(page).not_to have_text('Bibliotheca')
     end
 
-    scenario 'admin should see profile, classroom and bibliotheca' do
+    scenario 'admin should their account, classroom and bibliotheca' do
       set_current_user! admin
 
       visit '/'
 
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).to have_text('Classroom')
       expect(page).to have_text('Bibliotheca')
     end
 
-    scenario 'owner should see profile, classroom and bibliotheca' do
+    scenario 'owner should see their account, classroom and bibliotheca' do
       set_current_user! owner
 
       visit '/'
 
-      expect(page).to have_text('Profile')
+      expect(page).to have_text('My account')
       expect(page).to have_text('Classroom')
       expect(page).to have_text('Bibliotheca')
     end

data/spec/features/profile_flow_spec.rb

@@ -97,31 +97,29 @@ feature 'Profile Flow', organization_workspace: :test do
 
           click_on(button_options)
           expect(page).to have_text('Your data was updated successfully')
-          expect(page).to have_text('Profile')
+          expect(page).to have_text('My profile')
         end
       end
     end
 
     context 'with no messages' do
-
-      scenario 'visit messages tab' do
-        visit "/user#messages"
+      scenario 'visit messages' do
+        visit "/user/messages"
 
         expect(page).to have_text('It seems you don\'t have any messages yet!')
       end
     end
 
     context 'with messages' do
-      scenario 'visit messages tab' do
+      scenario 'visit messages' do
         Organization.find_by_name('test').switch!
         problem.submit_solution! user, {content: 'something'}
         Message.import_from_resource_h! message
-        visit "/user#messages"
+        visit "/user/messages"
 
         expect(page).to_not have_text('It seems you don\'t have any messages yet!')
         expect(page).to have_text(problem.name)
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 8.6.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.6.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.6.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '7.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '7.6'
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
   requirement: !ruby/object:Gem::Requirement
@@ -440,6 +440,7 @@ files:
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_timer.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_upload.scss
+- app/assets/stylesheets/mumuki_laboratory/application/modules/_user_menu.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss
 - app/controllers/ajax_controller.rb
 - app/controllers/api/base_controller.rb
@@ -495,6 +496,7 @@ files:
 - app/helpers/concerns/with_student_path_navigation/finish_navigation.rb
 - app/helpers/concerns/with_student_path_navigation/navigation.rb
 - app/helpers/concerns/with_student_path_navigation/revisit_navigation.rb
+- app/helpers/content_view_helper.rb
 - app/helpers/contextualization_result_helper.rb
 - app/helpers/discussions_helper.rb
 - app/helpers/editor_helper.rb
@@ -518,6 +520,7 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
+- app/helpers/user_menu_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
 - app/views/appendixes/show.html.erb
@@ -555,18 +558,19 @@ files:
 - app/views/exercise_solutions/_results_hidden.html.erb
 - app/views/exercise_solutions/_results_title.html.erb
 - app/views/exercises/_exercise_assignment.html.erb
+- app/views/exercises/_exercise_skipped.html.erb
+- app/views/exercises/_exercise_title_icons.html.erb
 - app/views/exercises/_read_only.html.erb
 - app/views/exercises/show.html.erb
+- app/views/guides/_guide.html.erb
+- app/views/guides/_guide_container.html.erb
+- app/views/guides/_guide_title_icons.html.erb
 - app/views/invitations/_invitation_form.html.erb
 - app/views/invitations/show.html.erb
 - app/views/layouts/_authoring.html.erb
 - app/views/layouts/_copyright.html.erb
 - app/views/layouts/_discussions.html.erb
 - app/views/layouts/_error.html.erb
-- app/views/layouts/_exercise_skipped.html.erb
-- app/views/layouts/_guide.html.erb
-- app/views/layouts/_guide_container.html.erb
-- app/views/layouts/_guide_title_icons.html.erb
 - app/views/layouts/_kids.html.erb
 - app/views/layouts/_kindergarten.html.erb
 - app/views/layouts/_main.html.erb
@@ -585,6 +589,7 @@ files:
 - app/views/layouts/_terms_acceptance_disclaimer.html.erb
 - app/views/layouts/_test_results.html.erb
 - app/views/layouts/_timer.html.erb
+- app/views/layouts/_user_menu.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/embedded.html.erb
 - app/views/layouts/exercise_inputs/editors/_code.html.erb
@@ -645,7 +650,9 @@ files:
 - app/views/users/_profile_fields.html.erb
 - app/views/users/_term.html.erb
 - app/views/users/_user_form.html.erb
+- app/views/users/discussions.html.erb
 - app/views/users/edit.html.erb
+- app/views/users/messages.html.erb
 - app/views/users/show.html.erb
 - app/views/users/terms.html.erb
 - config/i18n-tasks.yml

data/app/views/layouts/_guide_container.html.erb

@@ -1,28 +0,0 @@
-<%= content_for :breadcrumbs do %>
-  <%= breadcrumbs subject %>
-<% end %>
-
-<%= render layout: 'layouts/guide', locals: { subject: subject } do %>
-
-  <div class="row">
-    <div class="mu-inline-block-right">
-      <h1><%= language_icon @guide.language %></h1>
-    </div>
-    <div class="mu-inline-block-left guide-header">
-      <h1 class="pull-left">
-        <span class="pull-left">
-          <%= subject.name %>
-        </span>
-        <%= render partial: 'layouts/guide_title_icons' %>
-      </h1>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12">
-      <div class="text-box">
-        <%= @guide.description_html %>
-      </div>
-    </div>
-  </div>
-
-<% end %>