don't assign a random term with no sis id if none is given in sis import

it was doing a find_by_sis_source_id(nil)

also, don't find deleted terms

fixes #11465

test plan: create an enrollment term in the UI, separate from the
default term, with no sis id. do a course sis import and don't specify a
term, it should get assigned to the default term not the one you
created.

Change-Id: I4ff8e9df35b7f29237840314f118fe249d699838
Reviewed-on: https://gerrit.instructure.com/14738
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>

Author: codekitchen

lib/sis/course_importer.rb

@@ -68,7 +68,9 @@ def add_course(course_id, term_id, account_id, fallback_account_id, status, star
         course = Course.find_by_root_account_id_and_sis_source_id(@root_account.id, course_id)
         course ||= Course.new
         course_enrollment_term_id_stuck = course.stuck_sis_fields.include?(:enrollment_term_id)
-        term = course_enrollment_term_id_stuck ? nil : @root_account.enrollment_terms.find_by_sis_source_id(term_id)
+        if !course_enrollment_term_id_stuck && term_id
+          term = @root_account.enrollment_terms.active.find_by_sis_source_id(term_id)
+        end
         course.enrollment_term = term if term
         course.root_account = @root_account
 

spec/lib/sis/csv/course_importer_spec.rb

@@ -459,6 +459,18 @@
     end
   end
 
+  it "should use the default term if none given" do
+    @default_term = @account.default_enrollment_term
+    @default_term.should be_present
+    @nil_id_term = @account.enrollment_terms.create!(:name => "nil")
+    @with_id_term = @account.enrollment_terms.create!(:name => "test") { |t| t.sis_source_id = "test" }
+    process_csv_data_cleanly(
+      "course_id,short_name,long_name,status",
+      "c1,c1,c1,active")
+    @course = @account.courses.find_by_sis_source_id("c1")
+    @course.enrollment_term.should == @default_term
+  end
+
   context 'account associations' do
     before(:each) do
       process_csv_data_cleanly(