ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't bail when an abstract course is not available 

fixes #5183

Change-Id: I2425b901bcbc454ec5238694c337cda1b4e1de81
Reviewed-on: https://gerrit.instructure.com/4904
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
This commit is contained in:
JT Olds 2011-08-02 17:54:40 -06:00
parent b92427222e
commit c930cfd6db
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/sis/course_importer.rb
View File

@ -88,10 +88,10 @@ module SIS
abstract_course = nil
if row['abstract_course_id'].present?
abstract_course = AbstractCourse.find_by_root_account_id_and_sis_source_id(@root_account.id, row['abstract_course_id'])
unless abstract_course
add_warning(csv, "unknown abstract course id #{row['abstract_course_id']}")
next
add_warning(csv, "unknown abstract course id #{row['abstract_course_id']}, ignoring abstract course reference") unless abstract_course
end
if abstract_course
if row['term_id'].blank? && course.enrollment_term_id != abstract_course.enrollment_term
course.send(:association_instance_set, :enrollment_term, nil)
course.enrollment_term_id = abstract_course.enrollment_term_id

50
spec/lib/sis_csv_importer_spec.rb
View File

@ -212,14 +212,52 @@ describe SIS::SisCsv do
}
end
it 'should disallow instantiations of nonexistent abstract courses' do
beforecount = Course.count
it 'should skip references to nonexistent abstract courses' do
process_csv_data_cleanly(
"term_id,name,status,start_date,end_date",
"T001,Winter13,active,,"
)
process_csv_data_cleanly(
"account_id,parent_account_id,name,status",
"A001,,TestAccount,active"
)
process_csv_data(
"course_id,short_name,long_name,account_id,term_id,status,abstract_course_id",
"C001,,,,,active,AC001"
).tap{|i| i.errors.should == []; i.warnings.map(&:last).should == [
"unknown abstract course id AC001"]}
Course.count.should == beforecount
"C001,shortname,longname,,,active,AC001"
).tap do |i|
i.errors.should == []
i.warnings.map(&:last).should == [
"unknown abstract course id AC001, ignoring abstract course reference"]
end
Course.last.tap{|c|
c.sis_source_id.should == "C001"
c.abstract_course.should be_nil
c.short_name.should == "shortname"
c.name.should == "longname"
c.enrollment_term.should == @account.default_enrollment_term
c.account.should == @account
c.root_account.should == @account
}
process_csv_data_cleanly(
"abstract_course_id,short_name,long_name,account_id,term_id,status",
"AC001,Hum101,Humanities,A001,T001,active"
)
process_csv_data_cleanly(
"course_id,short_name,long_name,account_id,term_id,status,abstract_course_id",
"C001,shortname,longname,,,active,AC001"
)
Course.last.tap{|c|
c.sis_source_id.should == "C001"
c.abstract_course.should == AbstractCourse.last
c.abstract_course.sis_source_id.should == "AC001"
c.short_name.should == "shortname"
c.name.should == "longname"
c.enrollment_term.should == EnrollmentTerm.last
c.enrollment_term.name.should == "Winter13"
c.account.should == Account.last
c.account.name.should == "TestAccount"
c.root_account.should == @account
}
end
end