mumuki-laboratory 5.13.0 → 6.0.0

data/spec/api_helper.rb

@@ -0,0 +1,7 @@
+def set_token!(token)
+  @request.env["HTTP_AUTHORIZATION"] = token
+end
+
+def set_api_client!(api_client)
+  set_token! api_client.token
+end

data/spec/controllers/confirmations_controller_spec.rb

@@ -15,6 +15,6 @@ describe ExerciseConfirmationsController, organization_workspace: :test do
     before { post :create, params: { exercise_id: reading.id } }
 
     it { expect(response.status).to eq 200 }
-    it { expect(response.body.parse_json).to json_like(guide_finished_by_solution: true, class_for_progress_list_item: 'progress-list-item text-center success active') }
+    it { expect(response.body).to json_like(guide_finished_by_solution: true, class_for_progress_list_item: 'progress-list-item text-center success active') }
   end
 end

data/spec/controllers/organizations_api_controller_spec.rb

@@ -30,23 +30,23 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
       let!(:another_private_organization) { create :organization, name: 'another_private', public: false }
 
       context 'GET /organizations' do
+        let(:organization_names) { JSON.parse(response.body)['organizations'].map { |it| it['name'] }  }
+
         context 'with wildcard permissions' do
           before { get :index }
           let(:api_client) { create :api_client, role: :janitor, grant: '*' }
-          let!(:body) { response.body.parse_json }
 
           it { check_status! 200 }
 
-          it { expect(body[:organizations].map { |it| it[:name] }).to contain_exactly 'base', 'public', 'dot.org', 'private', 'another_private' }
+          it { expect(organization_names).to contain_exactly 'base', 'public', 'dot.org', 'private', 'another_private' }
         end
         context 'with non-wildcard permissions' do
           before { get :index }
           let(:api_client) { create :api_client, role: :janitor, grant: 'public/*:private/*' }
-          let!(:body) { response.body.parse_json }
 
           it { check_status! 200 }
 
-          it { expect(body[:organizations].map { |it| it[:name] }).to contain_exactly 'public', 'private' }
+          it { expect(organization_names).to contain_exactly 'public', 'private' }
         end
       end
 
@@ -87,7 +87,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
             let(:api_client) { create :api_client, role: :janitor, grant: 'private/*' }
 
             it { check_status! 200 }
-            it { expect(response.body.parse_json).to json_like(private_organization.as_platform_json) }
+            it { expect(response.body).to json_like(private_organization.to_resource_h) }
           end
         end
 
@@ -115,7 +115,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         let(:organization) { Organization.find_by name: 'a-name' }
 
         it { check_status! 200 }
-        it { expect(response.body.parse_json).to json_like(organization.as_platform_json) }
+        it { expect(response.body).to json_like(organization.to_resource_h) }
         it { expect(Organization.count).to eq 2 }
         it { expect(organization.name).to eq 'a-name' }
         it { expect(organization.contact_email).to eq 'an_email@gmail.com' }
@@ -170,7 +170,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
           end
 
           it { check_status! 400 }
-          it { expect(response.body.parse_json).to eq expected_errors }
+          it { expect(response.body).to json_eq expected_errors }
         end
       end
 
@@ -205,7 +205,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         before { put :update, params: {id: organization.name, organization: update_json} }
 
         it { check_status! 200 }
-        it { expect(response.body.parse_json).to json_like(
+        it { expect(response.body).to json_like(
                                             book: book.slug,
                                             name: "existing-organization",
                                             profile: {

data/spec/controllers/users_api_controller_spec.rb

@@ -25,13 +25,13 @@ describe Api::UsersController, type: :controller, organization_workspace: :base
     before { post :create, params: {user: user_json} }
 
     it { expect(response.status).to eq 200 }
-    it { expect(response.body.parse_json).to json_like({uid: 'foo@bar.com',
-                                                        first_name: 'foo',
-                                                        last_name: 'bar',
-                                                        email: 'foo@bar.com',
-                                                        permissions: {'student' => 'test/bar'},
-                                                        image_url: 'user_shape.png'},
-                                                       except: [:id, :created_at, :updated_at]) }
+    it { expect(response.body).to json_like({uid: 'foo@bar.com',
+                                             first_name: 'foo',
+                                             last_name: 'bar',
+                                             email: 'foo@bar.com',
+                                             permissions: {'student' => 'test/bar'},
+                                             image_url: 'user_shape.png'},
+                                            except: [:id, :created_at, :updated_at]) }
     it { expect(User.count).to eq 2 }
     it { expect(User.last.student? 'test/_').to be true }
     it { expect(User.last.uid).to eq 'foo@bar.com' }

data/spec/dummy/config/application.rb

@@ -8,6 +8,10 @@ require "mumuki/laboratory"
 module Dummy
   class Application < Rails::Application
     config.load_defaults 5.1
+
+    Mumuki::Domain::Engine.paths['db/migrate'].expanded.each do |expanded_path|
+      config.paths['db/migrate'] << expanded_path
+    end
   end
 end
 

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: 20181101180652) do
+ActiveRecord::Schema.define(version: 20181114201620) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,7 +51,6 @@ ActiveRecord::Schema.define(version: 20181101180652) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "locale", default: "en"
-    t.string "contact_email", default: "info@mumuki.org", null: false
     t.text "description"
     t.string "slug"
     t.index ["slug"], name: "index_books_on_slug", unique: true
@@ -166,6 +165,7 @@ ActiveRecord::Schema.define(version: 20181101180652) do
     t.text "assistance_rules"
     t.text "randomizations"
     t.text "free_form_editor_source"
+    t.text "teacher_info"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end
@@ -184,7 +184,10 @@ ActiveRecord::Schema.define(version: 20181101180652) do
     t.string "slug", default: "", null: false
     t.integer "type", default: 0, null: false
     t.text "authors"
-    t.text "contributors"
+    t.text "collaborators"
+    t.string "id_format", default: "%05d"
+    t.boolean "private", default: false
+    t.text "teacher_info"
     t.index ["name"], name: "index_guides_on_name"
     t.index ["slug"], name: "index_guides_on_slug", unique: true
   end
@@ -218,6 +221,8 @@ ActiveRecord::Schema.define(version: 20181101180652) do
     t.string "editor_js_urls", default: [], array: true
     t.string "editor_html_urls", default: [], array: true
     t.string "editor_css_urls", default: [], array: true
+    t.string "test_extension"
+    t.text "test_template"
     t.index ["name"], name: "index_languages_on_name", unique: true
   end
 

data/spec/dummy/db/seeds.rb

@@ -1,7 +1,7 @@
-require 'mumuki/laboratory/seed'
+require 'mumuki/domain/seed'
 
-Mumuki::Laboratory::Seed.import_languages!
-Mumuki::Laboratory::Seed.import_main_contents!
+Mumuki::Domain::Seed.import_languages!
+Mumuki::Domain::Seed.import_main_contents!
 
 Organization.find_or_create_by!(name: 'base') do |org|
   org.contact_email = 'issues@mumuki.org'
@@ -17,3 +17,7 @@ Organization.find_or_create_by!(name: 'private') do |org|
 end
 
 Organization.find_or_create_by!(name: 'central')
+
+User.find_or_create_by!(uid: 'dev.student@mumuki.org') { |org| org.permissions = {student: 'central/*'} }
+User.find_or_create_by!(uid: 'dev.teacher@mumuki.org') { |org| org.permissions = {teacher: 'private/*'} }
+User.find_or_create_by!(uid: 'dev.owner@mumuki.org') { |org| org.permissions = {owner: '*/*'} }

data/spec/evaluation_helper.rb

@@ -1,6 +1,6 @@
 Language.class_eval do
   def test_only_fake_response
-    {status: Mumuki::Laboratory::Status::Submission::Failed, result: 'noop result'}
+    {status: Mumuki::Domain::Status::Submission::Failed, result: 'noop result'}
   end
 
   def run_tests!(*)

data/spec/features/home_private_flow_spec.rb

@@ -18,6 +18,8 @@ feature 'private org' do
       ])
     ]) }
 
+  let!(:current_organization) { Organization.current }
+
   before { reindex_current_organization! }
 
 
@@ -56,10 +58,10 @@ feature 'private org' do
 
       visit '/'
 
-      expect(student.reload.last_organization).to eq Organization.current
+      expect(student.reload.last_organization).to eq current_organization
       expect(page).to have_text('powered by mumuki')
-      expect(page).to have_text(Organization.current.description)
-      expect(page).to have_text(Organization.current.book.description)
+      expect(page).to have_text(current_organization.description)
+      expect(page).to have_text(current_organization.book.description)
     end
 
     scenario 'teacher should access' do
@@ -67,10 +69,10 @@ feature 'private org' do
 
       visit '/'
 
-      expect(teacher.reload.last_organization).to eq Organization.current
+      expect(teacher.reload.last_organization).to eq current_organization
       expect(page).to have_text('powered by mumuki')
-      expect(page).to have_text(Organization.current.description)
-      expect(page).to have_text(Organization.current.book.description)
+      expect(page).to have_text(current_organization.description)
+      expect(page).to have_text(current_organization.book.description)
     end
   end
 end

data/spec/features/home_public_flow_spec.rb

@@ -7,7 +7,8 @@ feature 'public org', organization_workspace: :test do
   let!(:chapter) {
     create(:chapter, lessons: [
       create(:lesson, guide: guide)]) }
-  let(:book) { Organization.current.book }
+  let!(:current_organization) { Organization.current }
+  let(:book) { current_organization.book }
 
   before { reindex_current_organization! }
 
@@ -18,7 +19,7 @@ feature 'public org', organization_workspace: :test do
       visit '/'
 
       expect(page).to have_text('ム mumuki')
-      expect(page).to have_text(Organization.current.book.name)
+      expect(page).to have_text(current_organization.book.name)
       expect(page).not_to have_text('Exams')
     end
 
@@ -28,7 +29,7 @@ feature 'public org', organization_workspace: :test do
       visit '/'
 
       expect(page).to have_text('ム mumuki')
-      expect(page).to have_text(Organization.current.book.name)
+      expect(page).to have_text(current_organization.book.name)
     end
   end
 
@@ -43,8 +44,8 @@ feature 'public org', organization_workspace: :test do
       visit '/'
 
       expect(page).to have_text('ム mumuki')
-      expect(page).to have_text(Organization.current.book.name)
-      expect(user.reload.last_organization).to eq Organization.current
+      expect(page).to have_text(current_organization.book.name)
+      expect(user.reload.last_organization).to eq current_organization
       expect(page).to have_text('Exams')
     end
 
@@ -54,8 +55,8 @@ feature 'public org', organization_workspace: :test do
       visit '/'
 
       expect(page).to have_text('ム mumuki')
-      expect(page).to have_text(Organization.current.book.name)
-      expect(user.reload.last_organization).to eq Organization.current
+      expect(page).to have_text(current_organization.book.name)
+      expect(user.reload.last_organization).to eq current_organization
     end
   end
 end

data/spec/features/profile_flow_spec.rb

@@ -84,8 +84,9 @@ feature 'Standard Flow', organization_workspace: :test do
       end
 
       scenario 'visit messages tab' do
+        Organization.find_by_name('test').switch!
         problem.submit_solution! user, {content: 'something'}
-        Message.import_from_json! message
+        Message.import_from_resource_h! message
         visit "/user#messages"
 
         expect(page).to_not have_text('It seems you don\'t have any messages yet!')

data/spec/login_helper.rb

@@ -0,0 +1,20 @@
+Mumukit::Login.configure do |config|
+  config.auth0 = struct
+  config.saml = struct
+
+  config.mucookie_domain = '.localmumuki.io'
+  config.mucookie_secret_key = 'abcde1213456123456'
+  config.mucookie_secret_salt = 'mucookie test secret salt'
+  config.mucookie_sign_salt = 'mucookie test sign salt'
+end
+
+OmniAuth.config.test_mode = true
+OmniAuth.config.mock_auth[:developer] =
+  OmniAuth::AuthHash.new provider: 'developer',
+                         uid: 'johndoe@test.com',
+                         credentials: {},
+                         info: {first_name: 'John', last_name: 'Doe', name: 'John Doe', nickname: 'johndoe'}
+
+def set_current_user!(user)
+  allow_any_instance_of(ApplicationController).to receive(:current_user_uid).and_return(user.uid)
+end

data/spec/models/book_import_spec.rb

@@ -12,21 +12,21 @@ describe Book, organization_workspace: :test do
 
   let(:book) { Organization.current.book }
 
-  let(:book_json) do
+  let(:book_resource_h) do
     {name: 'sample book',
      description: 'a sample book description',
      slug: 'mumuki/mumuki-sample-book',
      locale: 'en',
      chapters: [topic_1.slug, topic_2.slug],
      complements: complement_slugs,
-    }.deep_stringify_keys
+    }
   end
 
-  describe '#import_from_json!' do
+  describe '#import_from_resource_h!' do
     context 'when complements are present' do
       let(:complement_slugs) { [guide_2.slug, guide_1.slug] }
 
-      before { book.import_from_json!(book_json) }
+      before { book.import_from_resource_h!(book_resource_h) }
 
       it { expect(book.name).to eq 'sample book' }
       it { expect(book.description).to eq 'a sample book description' }
@@ -41,7 +41,7 @@ describe Book, organization_workspace: :test do
     context 'when complements are not present' do
       let(:complement_slugs) { ['foo/bar', guide_1.slug] }
 
-      before { book.import_from_json!(book_json) }
+      before { book.import_from_resource_h!(book_resource_h) }
 
       it { expect(book.complements.count).to eq 1 }
     end

data/spec/models/course_spec.rb

@@ -10,7 +10,7 @@ describe 'CourseChanged', organization_workspace: :test do
      description: 'test course'}
   end
 
-  let!(:course) { Course.import_from_json! course_json }
+  let!(:course) { Course.import_from_resource_h! course_json }
 
   it { expect(course.organization.courses).to include course }
   it { expect(course.organization.name).to eq 'test' }

data/spec/models/event_generation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '#as_platform_json', organization_workspace: :test do
+describe '#to_resource_h', organization_workspace: :test do
   describe Assignment do
     let(:user) {
       create(:user,
@@ -30,7 +30,7 @@ describe '#as_platform_json', organization_workspace: :test do
 
       it { expect(lesson.number).to eq 4 }
       it do
-        expect(assignment.as_platform_json).to json_like(
+        expect(assignment.to_resource_h).to json_like(
                            status: :passed,
                            result: nil,
                            expectation_results: [],
@@ -89,7 +89,7 @@ describe '#as_platform_json', organization_workspace: :test do
                                 submission_id: 'abcd1234',
                                 exercise: exercise) }
       it do
-        expect(assignment.as_platform_json).to json_like(
+        expect(assignment.to_resource_h).to json_like(
                            status: :passed,
                            result: nil,
                            expectation_results: [],
@@ -144,7 +144,7 @@ describe '#as_platform_json', organization_workspace: :test do
                                 exercise: exercise) }
 
       it do
-        expect(assignment.as_platform_json).to json_like(
+        expect(assignment.to_resource_h).to json_like(
                            status: :passed,
                            result: nil,
                            expectation_results: [],

data/spec/models/exam_spec.rb

@@ -7,11 +7,11 @@ describe Exam, organization_workspace: :test do
   describe '#upsert' do
     let(:guide) { create(:guide) }
     let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [], organization: 'test'} }
-    let!(:exam) { Exam.import_from_json! exam_json }
+    let!(:exam) { Exam.import_from_resource_h! exam_json }
     context 'when new exam and the guide is the same' do
       let(:guide2) { create(:guide) }
       let(:exam_json2) { {eid: '2', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [], organization: 'test'} }
-      let!(:exam2) { Exam.import_from_json! exam_json2 }
+      let!(:exam2) { Exam.import_from_resource_h! exam_json2 }
       context 'and the organization is the same' do
         it { expect(Exam.count).to eq 1 }
         it { expect(Usage.where(item_id: guide.id, parent_item_id: exam.id).count).to eq 0 }
@@ -28,7 +28,7 @@ describe Exam, organization_workspace: :test do
       it { expect(exam.enabled?).to be false }
 
       context 'not authorized' do
-        it { expect { exam.validate_accessible_for! user }.to raise_error(Mumuki::Laboratory::ForbiddenError) }
+        it { expect { exam.validate_accessible_for! user }.to raise_error(Mumuki::Domain::ForbiddenError) }
       end
 
       context 'authorized' do
@@ -42,14 +42,14 @@ describe Exam, organization_workspace: :test do
       it { expect(exam.enabled?).to be true }
 
       context 'not authorized' do
-        it { expect { exam.validate_accessible_for! user }.to raise_error(Mumuki::Laboratory::ForbiddenError) }
+        it { expect { exam.validate_accessible_for! user }.to raise_error(Mumuki::Domain::ForbiddenError) }
       end
 
       context 'authorized' do
         before { exam.authorize! user }
 
         it { expect { exam.validate_accessible_for! user }.to_not raise_error }
-        it { expect { exam.validate_accessible_for! other_user }.to raise_error(Mumuki::Laboratory::ForbiddenError) }
+        it { expect { exam.validate_accessible_for! other_user }.to raise_error(Mumuki::Domain::ForbiddenError) }
       end
 
       context 'import_from_json' do
@@ -58,7 +58,7 @@ describe Exam, organization_workspace: :test do
         let(:guide) { create(:guide) }
         let(:duration) { 150 }
         let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: duration, language: 'haskell', name: 'foo', uids: [user.uid], organization: 'test'} }
-        before { Exam.import_from_json! exam_json }
+        before { Exam.import_from_resource_h! exam_json }
 
         context 'new exam' do
           it { expect(Exam.count).to eq 1 }
@@ -73,10 +73,10 @@ describe Exam, organization_workspace: :test do
 
         context 'existing exam' do
           let(:exam_json2) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [user2.uid], organization: 'test'} }
-          before { Exam.import_from_json! exam_json2 }
+          before { Exam.import_from_resource_h! exam_json2 }
 
           it { expect(Exam.count).to eq 1 }
-          it { expect { Exam.find_by(classroom_id: '1').validate_accessible_for! user }.to raise_error(Mumuki::Laboratory::ForbiddenError) }
+          it { expect { Exam.find_by(classroom_id: '1').validate_accessible_for! user }.to raise_error(Mumuki::Domain::ForbiddenError) }
           it { expect { Exam.find_by(classroom_id: '1').validate_accessible_for! user2 }.to_not raise_error }
         end
       end
@@ -85,7 +85,7 @@ describe Exam, organization_workspace: :test do
         let(:user) { create(:user, uid: 'auth0|1') }
         let(:guide) { create(:guide) }
         let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: duration, language: 'haskell', name: 'foo', uids: [user.uid], organization: 'test'} }
-        let(:exam) { Exam.import_from_json! exam_json }
+        let(:exam) { Exam.import_from_resource_h! exam_json }
         before { exam.start! user }
 
         context 'with duration' do
@@ -111,9 +111,9 @@ describe Exam, organization_workspace: :test do
         let(:user) { create(:user, uid: 'auth0|1') }
         let(:guide) { create(:guide) }
         let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [user.uid], organization: 'test'} }
-        let(:exam) { Exam.import_from_json! exam_json }
+        let(:exam) { Exam.import_from_resource_h! exam_json }
         before { exam.start! user }
-        before { Exam.import_from_json! exam_json.merge(organization: 'test') }
+        before { Exam.import_from_resource_h! exam_json.merge(organization: 'test') }
 
         it { expect(exam.started?(user)).to be true }
 
@@ -122,9 +122,9 @@ describe Exam, organization_workspace: :test do
       context 'create exam with non existing user' do
         let(:guide) { create(:guide) }
         let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [user.uid], organization: 'test'} }
-        let(:exam) { Exam.import_from_json! exam_json }
+        let(:exam) { Exam.import_from_resource_h! exam_json }
 
-        it { expect { Exam.import_from_json! exam_json.merge(organization: 'test') }.not_to raise_error }
+        it { expect { Exam.import_from_resource_h! exam_json.merge(organization: 'test') }.not_to raise_error }
 
       end
 
@@ -132,7 +132,7 @@ describe Exam, organization_workspace: :test do
         let(:teacher) { create(:user, uid: 'auth0|1') }
         let(:guide) { create(:guide) }
         let(:exam_json) { {eid: '1', slug: guide.slug, start_time: 5.minutes.ago, end_time: 10.minutes.since, duration: 150, language: 'haskell', name: 'foo', uids: [], organization: 'test'} }
-        let(:exam) { Exam.import_from_json! exam_json }
+        let(:exam) { Exam.import_from_resource_h! exam_json }
 
         context 'exam_authorization do not receive start method' do
           before { expect(teacher).to receive(:teacher_here?).and_return(true) }