coalescing_panda 3.1.5 → 3.1.6

data/spec/factories/accounts.rb

@@ -12,8 +12,13 @@ FactoryGirl.define do
       "Account #{n}"
     end
 
+    sequence :canvas_account_id do |n|
+      "#{n}"
+    end
+
     oauth2_client_id "1234"
     oauth2_client_key "thisisadeveloperkey"
     settings { {base_url: "http://localhost:3000", account_admin_api_token: "9q2083uy4poiahjfgpoawy"} }
+
   end
 end

data/spec/factories/courses.rb

@@ -1,7 +1,11 @@
 FactoryGirl.define do
   factory :course, class: CoalescingPanda::Course do
     account
+    term
     name "Test Course"
-    canvas_course_id "1"
+
+    sequence :canvas_course_id do |n|
+      n
+    end
   end
 end

data/spec/factories/enrollments.rb

@@ -1,7 +1,10 @@
 FactoryGirl.define do
   factory :enrollment, class: CoalescingPanda::Enrollment do
     user
-    course
-    canvas_enrollment_id '123'
+    section
+    sequence :canvas_enrollment_id do |n|
+      n
+    end
+    enrollment_type "StudentEnrollment"
   end
 end

data/spec/factories/sections.rb

@@ -1,6 +1,9 @@
 FactoryGirl.define do
   factory :section, class: CoalescingPanda::Section do
     course
-    canvas_section_id '123'
+    sequence :canvas_section_id do |n|
+      n
+    end
+
   end
 end

data/spec/factories/submissions.rb

@@ -2,7 +2,8 @@ FactoryGirl.define do
   factory :submission, class: CoalescingPanda::Submission do
     user
     assignment
-    canvas_submission_id '123'
-    graded false
+    sequence :canvas_submission_id do |n|
+      n
+    end
   end
 end

data/spec/factories/terms.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :term, class: CoalescingPanda::Term do
+    account
+
+    sequence :canvas_term_id do |n|
+      n
+    end
+  end
+end

data/spec/factories/users.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :user, class: CoalescingPanda::User do
+    account
     sequence :email do |n|
       "test#{n}@test.com"
     end

data/spec/helpers/coalescing_panda/canvas_batches_helper_spec.rb

@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CanvasBatchesHelper. For example:
+#
+# describe CanvasBatchesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+module CoalescingPanda
+  RSpec.describe CanvasBatchesHelper, :type => :helper do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

data/spec/models/coalescing_panda/assignment_spec.rb

@@ -15,4 +15,24 @@ RSpec.describe CoalescingPanda::Assignment, :type => :model do
     end
   end
 
+  context "validations" do
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:assignment, canvas_assignment_id: "")).to_not be_valid
+    end
+
+    it "should require a course" do
+      expect(FactoryGirl.build(:assignment, coalescing_panda_course_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to a course' do
+      course = FactoryGirl.create(:course)
+      assignment = FactoryGirl.create(:assignment, course: course, canvas_assignment_id: "1")
+      expect { FactoryGirl.create(:assignment, course: course, canvas_assignment_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:assignment)).to be_valid
+    end
+  end
+
 end

data/spec/models/coalescing_panda/course_spec.rb

@@ -34,4 +34,30 @@ RSpec.describe CoalescingPanda::Course, :type => :model do
       expect(CoalescingPanda::Course.reflect_on_association(:users).macro).to eql(:has_many)
     end
   end
+
+  context "validations" do
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:course, canvas_course_id: "")).to_not be_valid
+    end
+
+    it "should require an lti_account" do
+      expect(FactoryGirl.build(:course, coalescing_panda_lti_account_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to an account' do
+      account = FactoryGirl.create(:account)
+      course = FactoryGirl.create(:course, account: account, canvas_course_id: "1")
+      expect { FactoryGirl.create(:course, account: account, canvas_course_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it 'should be unique to an term' do
+      term = FactoryGirl.create(:term)
+      course = FactoryGirl.create(:course, term: term, canvas_course_id: "1")
+      expect { FactoryGirl.create(:course, term: term, canvas_course_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:course)).to be_valid
+    end
+  end
 end

data/spec/models/coalescing_panda/enrollment_spec.rb

@@ -14,4 +14,36 @@ RSpec.describe CoalescingPanda::Enrollment, :type => :model do
       expect(CoalescingPanda::Enrollment.reflect_on_association(:section).macro).to eql(:belongs_to)
     end
   end
+
+  context "validations" do
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:enrollment, canvas_enrollment_id: "")).to_not be_valid
+    end
+
+    it "should require a coalescing_panda_user_id" do
+      expect(FactoryGirl.build(:enrollment, coalescing_panda_user_id: "")).to_not be_valid
+    end
+
+    it "should require a coalescing_panda_section_id" do
+      expect(FactoryGirl.build(:enrollment, coalescing_panda_section_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to a user and section' do
+      user = FactoryGirl.create(:user)
+      section = FactoryGirl.create(:section)
+      enrollment = FactoryGirl.create(:enrollment, user: user, section: section, canvas_enrollment_id: "1", enrollment_type: "StudentEnrollment")
+      expect { FactoryGirl.create(:enrollment, user: user, section: section, canvas_enrollment_id: "1", enrollment_type: "StudentEnrollment") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it 'should not be unique with a different enrollment type' do
+      user = FactoryGirl.create(:user)
+      section = FactoryGirl.create(:section)
+      enrollment = FactoryGirl.create(:enrollment, user: user, section: section, canvas_enrollment_id: "1", enrollment_type: "StudentEnrollment")
+      expect { FactoryGirl.create(:enrollment, user: user, section: section, canvas_enrollment_id: "2", enrollment_type: "TeacherEnrollment") }.not_to raise_error
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:enrollment)).to be_valid
+    end
+  end
 end

data/spec/models/coalescing_panda/lti_account_spec.rb

@@ -14,4 +14,10 @@ RSpec.describe CoalescingPanda::LtiAccount, :type => :model do
       expect(CoalescingPanda::LtiAccount.reflect_on_association(:courses).macro).to eql(:has_many)
     end
   end
+
+  context 'validations' do
+    it 'should require a canvas id' do
+      expect(FactoryGirl.build(:account, canvas_account_id: "")).to_not be_valid
+    end
+  end
 end

data/spec/models/coalescing_panda/section_spec.rb

@@ -19,4 +19,24 @@ RSpec.describe CoalescingPanda::Section, :type => :model do
       expect(CoalescingPanda::Section.reflect_on_association(:users).macro).to eql(:has_many)
     end
   end
+
+  context "validations" do
+    it "should require a coalescing_panda_course_id" do
+      expect(FactoryGirl.build(:section, coalescing_panda_course_id: "")).to_not be_valid
+    end
+
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:section, canvas_section_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to a course' do
+      course = FactoryGirl.create(:course)
+      section = FactoryGirl.create(:section, course: course, canvas_section_id: "1")
+      expect { FactoryGirl.create(:section, course: course, canvas_section_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:section)).to be_valid
+    end
+  end
 end

data/spec/models/coalescing_panda/submission_spec.rb

@@ -13,6 +13,37 @@ RSpec.describe CoalescingPanda::Submission, :type => :model do
       expect(CoalescingPanda::Submission.reflect_on_association(:assignment)).to_not be_nil
       expect(CoalescingPanda::Submission.reflect_on_association(:assignment).macro).to eql(:belongs_to)
     end
+  end
+
+  context "validations" do
+    it "should require a user" do
+      expect(FactoryGirl.build(:submission, coalescing_panda_user_id: "")).to_not be_valid
+    end
+
+    it "should require a assignment" do
+      expect(FactoryGirl.build(:submission, coalescing_panda_assignment_id: "")).to_not be_valid
+    end
+
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:submission, canvas_submission_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to a user, assignment, and submission_id' do
+      user = FactoryGirl.create(:user)
+      assignment = FactoryGirl.create(:assignment)
+      submission = FactoryGirl.create(:submission, user: user, assignment: assignment, canvas_submission_id: "1")
+      expect { FactoryGirl.create(:submission, user: user, assignment: assignment, canvas_submission_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
 
+    it 'should not be unique with a different submission id' do
+      user = FactoryGirl.create(:user)
+      assignment = FactoryGirl.create(:assignment)
+      submission = FactoryGirl.create(:submission, user: user, assignment: assignment, canvas_submission_id: "1")
+      expect { FactoryGirl.create(:submission, user: user, assignment: assignment, canvas_submission_id: "2") }.not_to raise_error
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:submission)).to be_valid
+    end
   end
 end

data/spec/models/coalescing_panda/term_spec.rb

@@ -14,4 +14,16 @@ RSpec.describe CoalescingPanda::Term, :type => :model do
       expect(CoalescingPanda::Term.reflect_on_association(:courses).macro).to eql(:has_many)
     end
   end
+
+  context "validations" do
+    it "should require an account" do
+      expect(FactoryGirl.build(:term, coalescing_panda_lti_account_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to an account' do
+      account = FactoryGirl.create(:account)
+      term = FactoryGirl.create(:term, account: account, canvas_term_id: "1")
+      expect { FactoryGirl.create(:term, account: account, canvas_term_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+  end
 end

data/spec/models/coalescing_panda/user_spec.rb

@@ -24,4 +24,24 @@ RSpec.describe CoalescingPanda::User, :type => :model do
       expect(CoalescingPanda::User.reflect_on_association(:submissions).macro).to eql(:has_many)
     end
   end
+
+  context "validations" do
+    it "should require an account" do
+      expect(FactoryGirl.build(:user, coalescing_panda_lti_account_id: "")).to_not be_valid
+    end
+
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:user, canvas_user_id: "")).to_not be_valid
+    end
+
+    it 'should be unique to an account' do
+      account = FactoryGirl.create(:account)
+      user = FactoryGirl.create(:user, account: account, canvas_user_id: "1")
+      expect { FactoryGirl.create(:user, account: account, canvas_user_id: "1") }.to raise_error ActiveRecord::RecordNotUnique
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:user)).to be_valid
+    end
+  end
 end

data/spec/models/coalescing_panda/workers/course_miner_spec.rb

@@ -34,6 +34,7 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     Bearcat::Client.any_instance.stub(:course_sections) { double(Bearcat::ApiArray, :all_pages! => sections_response) }
     Bearcat::Client.any_instance.stub(:course_enrollments) { double(Bearcat::ApiArray, :all_pages! => enrollments_response) }
     Bearcat::Client.any_instance.stub(:assignments) { double(Bearcat::ApiArray, :all_pages! => assignments_response) }
+    Bearcat::Client.any_instance.stub(:get_course_submissions) { double(Bearcat::ApiArray, :all_pages! => {}) }
     Bearcat::Client.any_instance.stub(:get_course_submissions).with("1", "1") { double(Bearcat::ApiArray, :all_pages! => submissions_response1) }
     Bearcat::Client.any_instance.stub(:get_course_submissions).with("1", "2") { double(Bearcat::ApiArray, :all_pages! => submissions_response2) }
   end
@@ -89,6 +90,8 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
 
     it 'creates enrollments' do
       CoalescingPanda::Enrollment.destroy_all
+      worker.create_records(sections_response, :sections)
+      worker.create_records(users_response, :users)
       worker.create_records(enrollments_response, :enrollments)
       expect(CoalescingPanda::Enrollment.count).to eq 3
       expect(CoalescingPanda::Enrollment.last.workflow_state).to eq "active"
@@ -103,6 +106,8 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     it 'creates submissions' do
       CoalescingPanda::Submission.destroy_all
       submissions_response = submissions_response1 + submissions_response2
+      worker.create_records(users_response, :users)
+      worker.create_records(assignments_response, :assignments)
       worker.create_records(submissions_response, :submissions)
       expect(CoalescingPanda::Submission.count).to eq 4
     end
@@ -125,9 +130,9 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     end
 
     it 'returns enrollments attributes' do
-      attributes = {"associated_user_id"=>nil, "course_id"=>1, "course_section_id"=>1, "created_at"=>"2014-11-07T21:17:54Z", "end_at"=>end_time, "id"=>1, "limit_privileges_to_course_section"=>false, "root_account_id"=>1, "start_at"=>start_time, "type"=>"TeacherEnrollment", "updated_at"=>"2014-11-11T22:11:19Z", "user_id"=>1, "enrollment_state"=>"active", "role"=>"TeacherEnrollment", "role_id"=>4, "last_activity_at"=>"2014-11-24T16:48:54Z", "total_activity_time"=>63682, "sis_import_id"=>nil, "sis_course_id"=>"DOCSTUCOMM", "course_integration_id"=>nil, "sis_section_id"=>nil, "section_integration_id"=>nil, "html_url"=>"http://localhost:3000/courses/1/users/1", "user"=>{"id"=>1, "name"=>"teacher@test.com", "sortable_name"=>"teacher@test.com", "short_name"=>"teacher@test.com", "login_id"=>"teacher@test.com"}}
+      attributes = {"associated_user_id"=>nil, "course_id"=>1, "course_section_id"=>1, "created_at"=>"2014-11-07T21:17:54Z", "end_at"=>end_time, "id"=>1, "limit_privileges_to_course_section"=>false, "root_account_id"=>1, "start_at"=>start_time, "enrollment_type"=>"TeacherEnrollment", "updated_at"=>"2014-11-11T22:11:19Z", "user_id"=>1, "enrollment_state"=>"active", "role"=>"TeacherEnrollment", "role_id"=>4, "last_activity_at"=>"2014-11-24T16:48:54Z", "total_activity_time"=>63682, "sis_import_id"=>nil, "sis_course_id"=>"DOCSTUCOMM", "course_integration_id"=>nil, "sis_section_id"=>nil, "section_integration_id"=>nil, "html_url"=>"http://localhost:3000/courses/1/users/1", "user"=>{"id"=>1, "name"=>"teacher@test.com", "sortable_name"=>"teacher@test.com", "short_name"=>"teacher@test.com", "login_id"=>"teacher@test.com"}}
       record = CoalescingPanda::Enrollment.new
-      expect(worker.standard_attributes(record, attributes)).to eq({"created_at"=>"2014-11-07T21:17:54Z", "end_at"=>end_time, "start_at"=>start_time, "updated_at"=>"2014-11-11T22:11:19Z"})
+      expect(worker.standard_attributes(record, attributes)).to eq({"created_at"=>"2014-11-07T21:17:54Z", "end_at"=>end_time, "start_at"=>start_time, "enrollment_type"=>"TeacherEnrollment", "updated_at"=>"2014-11-11T22:11:19Z"})
     end
 
     it 'returns assignment attributes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -346,7 +346,6 @@ files:
 - db/migrate/20131114150001_create_coalescing_panda_canvas_api_auths.rb
 - db/migrate/20131118211442_create_coalescing_panda_lti_accounts.rb
 - db/migrate/20131119165343_create_coalescing_panda_lti_nonces.rb
-- db/migrate/20140722210735_add_settings_to_coalescing_panda_lti_account.rb
 - db/migrate/20140904223159_create_coalescing_panda_sessions.rb
 - db/migrate/20141119225319_create_coalescing_panda_terms.rb
 - db/migrate/20141119225721_create_coalescing_panda_courses.rb
@@ -355,10 +354,8 @@ files:
 - db/migrate/20141120152458_create_coalescing_panda_users.rb
 - db/migrate/20141120152546_create_coalescing_panda_submissions.rb
 - db/migrate/20141120153135_create_coalescing_panda_enrollments.rb
-- db/migrate/20141120205729_add_canvas_account_id_to_lti_account.rb
 - db/migrate/20141121174846_create_coalescing_panda_canvas_batches.rb
 - db/migrate/20141124160857_create_delayed_jobs.rb
-- db/migrate/20141125185516_add_type_to_enrollments.rb
 - lib/coalescing_panda.rb
 - lib/coalescing_panda/controller_helpers.rb
 - lib/coalescing_panda/engine.rb
@@ -374,6 +371,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/account.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -400,6 +398,7 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -411,7 +410,9 @@ files:
 - spec/factories/enrollments.rb
 - spec/factories/sections.rb
 - spec/factories/submissions.rb
+- spec/factories/terms.rb
 - spec/factories/users.rb
+- spec/helpers/coalescing_panda/canvas_batches_helper_spec.rb
 - spec/models/coalescing_panda/assignment_spec.rb
 - spec/models/coalescing_panda/canvas_api_auth_spec.rb
 - spec/models/coalescing_panda/canvas_batch_spec.rb
@@ -457,6 +458,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/account.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -483,6 +485,7 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -496,7 +499,9 @@ test_files:
 - spec/factories/enrollments.rb
 - spec/factories/sections.rb
 - spec/factories/submissions.rb
+- spec/factories/terms.rb
 - spec/factories/users.rb
+- spec/helpers/coalescing_panda/canvas_batches_helper_spec.rb
 - spec/models/coalescing_panda/assignment_spec.rb
 - spec/models/coalescing_panda/canvas_api_auth_spec.rb
 - spec/models/coalescing_panda/canvas_batch_spec.rb
@@ -511,3 +516,4 @@ test_files:
 - spec/models/coalescing_panda/workers/course_miner_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+has_rdoc: