mumuki-laboratory 5.0.12 → 5.1.0

data/spec/dummy/db/schema.rb

@@ -15,6 +15,15 @@ ActiveRecord::Schema.define(version: 20180402015405) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "api_clients", force: :cascade do |t|
+    t.string "description"
+    t.string "token"
+    t.bigint "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_api_clients_on_user_id"
+  end
+
   create_table "assignments", id: :serial, force: :cascade do |t|
     t.text "solution"
     t.integer "exercise_id"

data/spec/factories/api_client_factory.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :api_client do |t|
+    transient do
+      role :janitor
+      grant 'test/*'
+    end
+
+    description "foo"
+    user {
+      create :user,
+             first_name: 'foo',
+             last_name: 'bar',
+             email: 'foo+1@bar.com',
+             uid: 'foo+1@bar.com',
+             permissions: { role => grant }
+      }
+  end
+end

data/spec/factories/course_factory.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :course do
+    period '2016'
+    shifts %w(morning)
+    days %w(monday wednesday)
+    description 'test'
+    organization_id 1
+  end
+end

data/spec/features/chapter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Chapters flow' do
+feature 'Chapters flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
 
   let!(:chapter) {

data/spec/features/complements_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Complements Flow' do
+feature 'Complements Flow', organization_workspace: :test do
   let(:complement_not_in_path) { create(:complement) }
 
   before { reindex_current_organization! }

data/spec/features/exams_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Exams Flow' do
+feature 'Exams Flow', organization_workspace: :test do
   let(:exam) { create(:exam, classroom_id: '12345') }
   let(:other_exam) { create(:exam, organization: other_organization) }
   let!(:exam_not_in_path) { create :exam }

data/spec/features/exercise_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Exercise Flow' do
+feature 'Exercise Flow', organization_workspace: :test do
   let(:user) { create(:user) }
 
   let(:haskell) { create(:haskell) }

data/spec/features/guide_reset_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Exercise Flow' do
+feature 'Exercise Flow', organization_workspace: :test do
   let(:user) { create(:user) }
 
   let!(:problem) { build(:problem)}

data/spec/features/guides_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Guides Flow' do
+feature 'Guides Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
   let!(:exercises) { [
     create(:exercise, name: 'Foo', guide: guide, number: 1, description: 'Description of foo'),

data/spec/features/home_public_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'public org' do
+feature 'public org', organization_workspace: :test do
   let!(:exercise) { build(:exercise) }
   let(:guide) { create(:guide) }
   let(:exam) { create(:exam) }

data/spec/features/lessons_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Lessons Flow' do
+feature 'Lessons Flow', organization_workspace: :test do
   let(:lesson_not_in_path) { create(:lesson) }
 
   before { reindex_current_organization! }

data/spec/features/links_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Lessons Flow' do
+feature 'Lessons Flow', organization_workspace: :test do
   let(:exercise) { create(:exercise, name:  'E1') }
   let!(:complement) { create(:complement) }
   let!(:lesson) { create(:lesson, name: 'L1', exercises: [exercise]) }

data/spec/features/login_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Login Flow' do
+feature 'Login Flow', organization_workspace: :test do
   let!(:chapter) do
     create(:chapter, name: 'C1', lessons: [
       create(:lesson, language: create(:language), name: 'awesomeRubyGuide', description: 'rubist baz guide', exercises: [

data/spec/features/profile_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Standard Flow' do
+feature 'Standard Flow', organization_workspace: :test do
   let!(:user) { create(:user, uid: 'mumuki@test.com', first_name: nil) }
   let!(:user2) { create(:user, uid: 'johndoe@test.com') }
   let(:haskell) { create(:haskell) }

data/spec/features/standard_flow_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Standard Flow' do
+feature 'Standard Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
 
   let!(:chapter) {

data/spec/helpers/application_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ApplicationHelper do
+describe ApplicationHelper, organization_workspace: :test do
   helper ApplicationHelper
   helper LinksHelper
 

data/spec/helpers/email_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EmailHelper do
+describe EmailHelper, organization_workspace: :test do
   helper EmailHelper
 
   before { I18n.locale = :en }

data/spec/helpers/exercise_input_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ApplicationHelper do
+describe ApplicationHelper, organization_workspace: :test do
   helper ExerciseInputHelper
 
   describe 'should_render_message_input?' do

data/spec/helpers/with_breadcrumbs_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BreadcrumbsHelper do
+describe BreadcrumbsHelper, organization_workspace: :test do
 
   helper BreadcrumbsHelper
   helper LinksHelper

data/spec/helpers/with_navigation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe WithStudentPathNavigation do
+describe WithStudentPathNavigation, organization_workspace: :test do
   helper WithStudentPathNavigation
   helper FontAwesome::Rails::IconHelper
 

data/spec/models/assignment_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Assignment do
+describe Assignment, organization_workspace: :test do
 
   describe 'messages' do
     let(:student) { create(:user) }

data/spec/models/book_import_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Book do
+describe Book, organization_workspace: :test do
   let!(:haskell) { create(:haskell) }
   let!(:gobstones) { create(:gobstones) }
 

data/spec/models/book_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Book do
+describe Book, organization_workspace: :test do
   let(:book) { Organization.current.book }
 
   describe '#next_lesson_for' do

data/spec/models/course_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'CourseChanged' do
+describe 'CourseChanged', organization_workspace: :test do
   let(:course_json) do
     {slug: 'test/bar',
      shifts: %w(morning),

data/spec/models/event_generation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '#as_platform_json' do
+describe '#as_platform_json', organization_workspace: :test do
   describe Assignment do
     let(:user) {
       create(:user,

data/spec/models/exam_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Exam do
+describe Exam, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:other_user) { create(:user) }
 

data/spec/models/exercise_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Exercise do
+describe Exercise, organization_workspace: :test do
   let(:exercise) { create(:exercise) }
   let(:user) { create(:user) }
 
@@ -88,14 +88,22 @@ describe Exercise do
       it { expect(exercise_with_extra.extra).to eq "exercise extra code\n" }
     end
 
-    context 'when exercise has extra code and belong to a guide with no extra code' do
+    context 'when exercise has extra code and belongs to a guide with no extra code' do
       let!(:exercise_with_extra) { create(:exercise, guide: guide, extra: 'exercise extra code') }
       let!(:guide) { create(:guide) }
 
       it { expect(exercise_with_extra.extra).to eq "exercise extra code\n" }
     end
 
-    context 'when exercise has extra code and belong to a guide with extra code' do
+    context 'when exercise has extra code with trailing whitespaces
+             and belongs to a guide with no extra code' do
+      let!(:exercise_with_extra) { create(:exercise, guide: guide, extra: "\nexercise extra code \n") }
+      let!(:guide) { create(:guide) }
+
+      it { expect(exercise_with_extra.extra).to eq "exercise extra code\n" }
+    end
+
+    context 'when exercise has extra code and belongs to a guide with extra code' do
       let!(:exercise_with_extra) { create(:exercise, guide: guide, extra: 'exercise extra code') }
       let!(:guide) { create(:guide, extra: 'guide extra code') }
 

data/spec/models/guide_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Guide do
+describe Guide, organization_workspace: :test do
   let!(:extra_user) { create(:user, first_name: 'Ignatius', last_name: 'Reilly') }
   let(:guide) { create(:guide) }
 

data/spec/models/interactive_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Interactive do
+describe Interactive, organization_workspace: :test do
   let!(:interactive) { create(:interactive) }
   let!(:user) { create(:user) }
   let(:assignment) { interactive.find_or_init_assignment_for(user) }

data/spec/models/lesson_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Lesson do
+describe Lesson, organization_workspace: :test do
   let(:user) { create(:user) }
   describe '#friendly' do
     let!(:chapter) {

data/spec/models/message_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Message do
+describe Message, organization_workspace: :test do
   describe '#parse_json' do
     let(:data) {
       {'exercise_id' => 1,

data/spec/models/navigation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Navigation' do
+describe 'Navigation', organization_workspace: :test do
   let(:organization_1) { create(:organization, name: 'org1', book: book_1) }
   let(:organization_2) { create(:organization, name: 'org2', book: book_2) }
 

data/spec/models/organization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Organization do
+describe Organization, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:central) { create(:organization, name: 'central') }
 

data/spec/models/problem_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Problem do
+describe Problem, organization_workspace: :test do
 
   context 'when no manual evaluation and' do
     before { problem.manual_evaluation = false }

data/spec/models/question_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Query do
+describe Query, organization_workspace: :test do
   let!(:exercise) { create(:problem) }
   let(:student) { create(:user) }
 

data/spec/models/reading_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Reading do
+describe Reading, organization_workspace: :test do
   let!(:reading) { create(:reading) }
   let!(:user) { create(:user) }
 

data/spec/models/solution_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Solution do
+describe Solution, organization_workspace: :test do
 
   describe '#run_tests!' do
     let(:user) { create(:user) }

data/spec/models/usage_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Usage, clean: true do
+describe Usage do
 
   let!(:fundamentals) { create(:topic) }
   let!(:functional_programming) { create(:topic) }

data/spec/models/user_changed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, organization_workspace: :test do
   let(:user) { User.find_by(uid: 'foo@bar.com') }
   let(:user_json) { {
     uid: 'foo@bar.com',

data/spec/models/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, organization_workspace: :test do
   describe '#clear_progress!' do
     let(:student) { create :user }
     let(:more_clauses) { create(:exercise, name: 'More Clauses') }
@@ -25,7 +25,7 @@ describe User do
     context 'when final user has less information than original' do
       let!(:submission) { your_first_program.submit_solution! original, content: 'adasdsadas' }
 
-      before { original.reload.transfer_progress_to! final }
+      before { original.reload.copy_progress_to! final }
 
       let(:original) { create :user,
                               permissions: {student: 'codeorga/*'},
@@ -54,7 +54,7 @@ describe User do
 
     context 'when final user has more information than original' do
       before { more_clauses.submit_solution! final, content: 'adasdsadas' }
-      before { original.transfer_progress_to! final.reload }
+      before { original.copy_progress_to! final.reload }
 
       let(:original) { create :user,
                               permissions: Mumukit::Auth::Permissions.new,
@@ -79,7 +79,7 @@ describe User do
     end
 
     context 'when both have information, but final is newer' do
-      before { original.transfer_progress_to! final }
+      before { original.copy_progress_to! final }
 
       let(:original) { create :user,
                               permissions: {student: 'codeorga/*'},
@@ -109,7 +109,7 @@ describe User do
     end
 
     context 'when both have information, but original is newer' do
-      before { original.transfer_progress_to! final }
+      before { original.copy_progress_to! final }
 
       let(:original) { create :user,
                               permissions: {student: 'codeorga/*'},