omit deleted questions when exporting question banks

fixes #9816

test plan: create a question bank, add a couple questions, and delete at
least one question. copy the course, verify that the new course doesn't
have the deleted question in the bank, but has the others.

Change-Id: Icdbe4cf4a8a98d04aa755e1f89b0f87538b08023
Reviewed-on: https://gerrit.instructure.com/12908
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>

Author: codekitchen

lib/cc/qti/qti_generator.rb

@@ -259,7 +259,7 @@ def generate_assessment(doc, quiz, migration_id, for_cc=true)
           end # assessment_node
         end # qti node
       end
-      
+
       def generate_bank(doc, bank, migration_id)
         doc.instruct!
         doc.questestinterop("xmlns" => "http://www.imsglobal.org/xsd/ims_qtiasiv1p2",
@@ -269,19 +269,19 @@ def generate_bank(doc, bank, migration_id)
           qti_node.objectbank(
                   :ident => migration_id
           ) do |bank_node|
-            
+
             bank_node.qtimetadata do |meta_node|
               meta_field(meta_node, 'bank_title', bank.title)
             end # meta_node
-            
-            bank.assessment_questions.each do |aq|            
+
+            bank.assessment_questions.active.each do |aq|
               add_question(bank_node, aq.data.with_indifferent_access)
             end
-            
+
           end # bank_node
         end # qti node
       end
-      
+
       def meta_field(node, label, entry)
         node.qtimetadatafield do |meta_node|
           meta_node.fieldlabel label

spec/models/content_migration_spec.rb

@@ -614,7 +614,23 @@ def mig_id(obj)
       g.assessment_question_bank_id.should == bank2.id
       g = q.quiz_groups[2]
       g.assessment_question_bank_id.should == nil
+    end
+
+    it "should omit deleted questions in banks" do
+      pending unless Qti.qti_enabled?
+      bank1 = @copy_from.assessment_question_banks.create!(:title => 'bank')
+      q1 = bank1.assessment_questions.create!(:question_data => {'name' => 'test question', 'answers' => [{'id' => 1}, {'id' => 2}]})
+      q2 = bank1.assessment_questions.create!(:question_data => {'name' => 'test question 2', 'answers' => [{'id' => 3}, {'id' => 4}]})
+      q3 = bank1.assessment_questions.create!(:question_data => {'name' => 'test question 3', 'answers' => [{'id' => 5}, {'id' => 6}]})
+      q2.destroy
+
+      run_course_copy
 
+      bank2 = @copy_to.assessment_question_banks.first
+      bank2.should be_present
+      # we don't copy over deleted questions at all, not even marked as deleted
+      bank2.assessment_questions.active.size.should == 2
+      bank2.assessment_questions.size.should == 2
     end
 
     it "should copy a discussion topic when assignment is selected" do