From fe245efdc51c815f2b8dd8de649f87e64369171c Mon Sep 17 00:00:00 2001 From: Rob Orton Date: Sun, 15 Dec 2013 05:35:56 -0700 Subject: [PATCH] change conclude to completed on sis_export report closes CNVS-2470 test plan - have a concluded course - run sis export{courses, include deleted objects} - csv should have concluded course as completed Change-Id: I13242e4e5b9a0ab2e68d3e801a29214ec0af182e Reviewed-on: https://gerrit.instructure.com/27538 Tested-by: Jenkins Reviewed-by: Cody Cutrer QA-Review: Rob Orton Product-Review: Rob Orton --- .../account_reports/lib/canvas/account_reports/sis_exporter.rb | 2 +- .../spec_canvas/sis_provisioning_reports_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vendor/plugins/account_reports/lib/canvas/account_reports/sis_exporter.rb b/vendor/plugins/account_reports/lib/canvas/account_reports/sis_exporter.rb index 5bcaec3b027..8aaab5d7112 100644 --- a/vendor/plugins/account_reports/lib/canvas/account_reports/sis_exporter.rb +++ b/vendor/plugins/account_reports/lib/canvas/account_reports/sis_exporter.rb @@ -235,7 +235,7 @@ module Canvas::AccountReports #for sis import format 'claimed', 'created', and 'available' are all considered active if @sis_format if c.workflow_state == 'deleted' || c.workflow_state == 'completed' - row << course_state_sub[c.workflow_state] + row << c.workflow_state else row << 'active' end diff --git a/vendor/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb b/vendor/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb index 01413d729a4..1e0210f9d47 100644 --- a/vendor/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb +++ b/vendor/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb @@ -477,6 +477,7 @@ describe "Default Account Reports" do end it "should run the SIS report with sis term and deleted courses" do + @course1.complete parameters = {} parameters["enrollment_term_id"] = "sis_term_id:fall12" parameters["include_deleted"] = true @@ -485,7 +486,7 @@ describe "Default Account Reports" do parsed.length.should == 2 parsed[0].should == [@course1.sis_source_id,@course1.course_code,@course1.name, - @sub_account.sis_source_id,@term1.sis_source_id,"active", + @sub_account.sis_source_id,@term1.sis_source_id,"completed", @course1.start_at.iso8601,@course1.conclude_at.iso8601] parsed[1].should == ["SIS_COURSE_ID_5","ENG101","Sd Math 100","sub1", "fall12","deleted",nil,nil]