mumuki-laboratory 7.5.1 → 7.7.0

data/spec/features/disabled_organization_flow_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+feature 'disable user flow', organization_workspace: :test do
+  let!(:current_organization) { Organization.current }
+  let(:user) { create(:user) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [
+        create(:lesson, guide: create(:guide))]) }
+
+  let(:book) { current_organization.book }
+
+  before { reindex_current_organization! }
+
+  before { set_current_user! user }
+
+  scenario 'enabled organization' do
+    visit '/'
+
+    expect(page).to have_text('ム mumuki')
+    expect(page).to have_text(current_organization.book.name)
+    expect(user.reload.last_organization).to eq current_organization
+  end
+
+  context 'unprepared organization' do
+
+    before { current_organization.update! in_preparation_until: 2.minutes.since }
+
+    scenario 'visit /' do
+      visit '/'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:unprepared_organization_explanation))
+    end
+
+    scenario 'visit /user' do
+      visit '/test/user'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:unprepared_organization_explanation))
+    end
+
+  end
+
+  context 'disabled organization' do
+
+    before { current_organization.update! disabled_from: 2.minutes.ago }
+
+    scenario 'visit /' do
+      visit '/'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:disabled_organization_explanation))
+    end
+
+    scenario 'visit /user' do
+      visit '/test/user'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:disabled_organization_explanation))
+    end
+
+    end
+end
+

data/spec/features/exercise_flow_spec.rb

@@ -6,23 +6,23 @@ feature 'Exercise Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
   let(:gobstones) { create(:gobstones) }
 
-  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!(: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(: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(: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!(: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) }
 
   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
+        problem_1, problem_2, problem_3, problem_4, reading, problem_5, problem_6, problem_7, playground_1, playground_2, kids_problem
       ])
     ]) }
 
@@ -61,6 +61,15 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Description of Succ1')
     end
 
+    scenario 'visit kids exercise transparently' do
+      visit "/exercises/#{kids_problem.transparent_id}"
+
+      expect(page).to have_text('Kids prob')
+      expect(page).to_not have_text('Console')
+      expect(page).to_not have_text('Solution')
+      expect(page).to have_text('Description of kids prob')
+    end
+
     scenario 'visit exercise by id, upload layout' do
       visit "/exercises/#{problem_3.id}"
 

data/spec/features/home_public_flow_spec.rb

@@ -4,9 +4,12 @@ feature 'public org', organization_workspace: :test do
   let!(:exercise) { build(:exercise) }
   let(:guide) { create(:guide) }
   let(:exam) { create(:exam) }
-  let!(:chapter) {
-    create(:chapter, lessons: [
+  let!(:chapter_1) {
+    create(:chapter, name: 'First Steps', number: 1, lessons: [
       create(:lesson, guide: guide)]) }
+  let!(:chapter_2) {
+      create(:chapter, name: 'Functional Programming', number: 2, lessons: [
+        create(:lesson, guide: guide)]) }
   let!(:current_organization) { Organization.current }
   let(:book) { current_organization.book }
 
@@ -19,6 +22,8 @@ feature 'public org', organization_workspace: :test do
       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).not_to have_text('Exams')
     end
@@ -29,6 +34,8 @@ feature 'public org', organization_workspace: :test do
       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)
     end
   end
@@ -44,6 +51,8 @@ feature 'public org', organization_workspace: :test do
       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(user.reload.last_organization).to eq current_organization
       expect(page).to have_text('Exams')
@@ -55,6 +64,29 @@ feature 'public org', organization_workspace: :test do
       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_not have_selector('.chapter.mu-locked', text: 'Functional Programming')
+
+      expect(page).to have_text(current_organization.book.name)
+      expect(user.reload.last_organization).to eq current_organization
+    end
+  end
+
+  context 'logged visitor in progressive display organization' do
+    let(:user) { create(:user) }
+    before { current_organization.enable_progressive_display! }
+    before { set_current_user! user }
+    before { exam.authorize! user }
+
+    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.mu-locked', text: 'Functional Programming')
       expect(page).to have_text(current_organization.book.name)
       expect(user.reload.last_organization).to eq current_organization
     end

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -91,7 +91,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
         expect(breadcrumb).to include('my lesson')
         expect(breadcrumb).to include('my exercise')
         expect(breadcrumb).to include('discussions')
-        expect(breadcrumb).to include(discussion.title)
+        expect(breadcrumb).to include(discussion.item.navigable_name)
         expect(breadcrumb).to be_html_safe
       end
     end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/Gemfile

@@ -6,7 +6,7 @@ gemspec
 
 group :test do
   gem 'rspec-rails', '~> 3.6'
-  gem 'factory_bot_rails'
+  gem 'factory_bot_rails', '~> 5.0'
   gem 'rake', '~> 12.3'
   gem 'faker', '~> 2.2'
 end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/book.rb

@@ -62,4 +62,17 @@ class Book < Content
   def structural_parent
     nil
   end
+
+  ## progressive display
+
+  def enabled_chapters_in(workspace)
+    workspace.enabled_containers(chapters)
+  end
+
+  # experimental API - it may change in the future.
+  # This method assumes no gaps in the sequences are introduced
+  # by enabled_chapters_in
+  def chapter_visibilities_in(workspace)
+    chapters.zip(enabled_chapters_in(workspace)).map { |chapter, enabled| [chapter, !enabled.nil?] }
+  end
 end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8/app/models/concerns/with_content.rb → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94/app/models/concerns/container.rb}

@@ -1,4 +1,4 @@
-module WithContent
+module Container
   extend ActiveSupport::Concern
 
   included do

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/guide_container.rb

@@ -1,6 +1,6 @@
 module GuideContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :guide

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/submittable/solvable.rb

@@ -1,6 +1,6 @@
 module Solvable
-  def submit_solution!(user, attributes={})
-    assignment, _ = find_assignment_and_submit! user, attributes[:content].to_mumuki_solution(language)
+  def submit_solution!(user, submission_attributes={})
+    assignment, _ = find_assignment_and_submit! user, solution_for(submission_attributes)
     try_solve_discussions(user) if assignment.solved?
     assignment
   end
@@ -8,6 +8,12 @@ module Solvable
   def run_tests!(params)
     language.run_tests!(params.merge(locale: locale, expectations: expectations, custom_expectations: custom_expectations))
   end
+
+  def solution_for(submission_attributes)
+    submission_attributes[:content]
+      .to_mumuki_solution(language)
+      .with_client_result(submission_attributes[:client_result])
+  end
 end
 
 class NilClass

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/topic_container.rb

@@ -1,6 +1,6 @@
 module TopicContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :topic

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/with_discussions.rb

@@ -7,11 +7,7 @@ module WithDiscussions
   end
 
   def discuss!(user, discussion, organization = Organization.current)
-    discussion.merge!(initiator_id: user.id, organization: organization)
-    discussion.merge!(submission: submission_for(user)) if submission_for(user).present?
-    created_discussion = discussions.create discussion
-    user.subscribe_to! created_discussion
-    created_discussion
+    new_discussion_for(user, discussion, organization).tap &:save!
   end
 
   def submission_for(_)
@@ -21,4 +17,11 @@ module WithDiscussions
   def try_solve_discussions(user)
     discussions.where(initiator: user).map(&:try_solve!)
   end
+
+  def new_discussion_for(user, discussion_h = {}, organization = Organization.current)
+    discussion_h.merge!(initiator_id: user.id, organization: organization)
+    discussion_h.merge!(submission: submission_for(user)) if submission_for(user).present?
+    discussions.new discussion_h
+  end
+
 end

data/vendor/bundle/ruby/2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94/app/models/concerns/with_layout.rb

@@ -0,0 +1,11 @@
+module WithLayout
+  extend ActiveSupport::Concern
+
+  included do
+    enum layout: [:input_right, :input_bottom, :input_primary, :input_kindergarten]
+  end
+
+  def input_kids?
+    input_primary? || input_kindergarten?
+  end
+end

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/with_progress.rb

@@ -19,6 +19,10 @@ module WithProgress
     self
   end
 
+  def completed_for?(user, organization)
+    progress_for(user, organization).completed?
+  end
+
   private
 
   def structural_children_changed?(old_structural_children)

data/vendor/bundle/ruby/{2.3.0/bundler/gems/mumuki-domain-a059418e5fd8 → 2.6.0/bundler/gems/mumuki-domain-cb7a9018bb94}/app/models/concerns/with_scoped_queries.rb

@@ -16,8 +16,8 @@ module WithScopedQueries
   end
 
   class_methods do
-    def query_methods
-      queriable_attributes.keys
+    def query_methods(excluded_methods)
+      queriable_attributes.keys - excluded_methods.to_a
     end
 
     def scoped_query_module(method)
@@ -28,19 +28,19 @@ module WithScopedQueries
       queriable_attributes.values.flatten
     end
 
-    def actual_params(params, excluded_param)
-      params.reject { |it| it == excluded_param.to_s }
+    def actual_params(params, excluded_params)
+      params.except(*excluded_params)
     end
 
-    def scoped_query_by(params, excluded_param=nil)
-      query_methods.inject(all) do |scope, method|
-        valid_params = valid_params_for(method, params, excluded_param)
+    def scoped_query_by(params, **options)
+      query_methods(options[:excluded_methods]).inject(all) do |scope, method|
+        valid_params = valid_params_for(method, params, options[:excluded_params])
         scoped_query_module(method).query_by valid_params, scope, self
       end
     end
 
-    def valid_params_for(method, params, excluded_param)
-      actual_params = actual_params(params, excluded_param)
+    def valid_params_for(method, params, excluded_params)
+      actual_params = actual_params(params, excluded_params)
       actual_params.permit queriable_attributes[method]
     end
   end