don't copy announcements if all_discussion_topics are selected

test plan:
* create a course with an announcment and discussion topic
* copy the course (with selected content), unchecking the
 'Announcements' box
* should not import the announcement

fixes #CNVS-7285

Change-Id: I22e0f52df5f1af7a5532b143396ea40e86b3f1d1
Reviewed-on: https://gerrit.instructure.com/22935
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>

Author: maneframe

lib/cc/topic_resources.rb

@@ -20,7 +20,11 @@ module TopicResources
 
     def add_topics
       @course.discussion_topics.active.each do |topic|
-        next unless export_object?(topic) || export_object?(topic.assignment) || (topic.is_announcement && export_object?(topic, 'announcements'))
+        if topic.is_announcement
+          next unless export_object?(topic, 'announcements')
+        else
+          next unless export_object?(topic) || export_object?(topic.assignment)
+        end
 
         title = topic.title rescue I18n.t('course_exports.unknown_titles.topic', "Unknown topic")
 

spec/lib/cc/cc_exporter_spec.rb

@@ -108,7 +108,8 @@ def check_resource_node(obj, type, selected=true)
 
       # only select one of each type
       @ce.selected_content = {
-              :discussion_topics => {mig_id(@dt1) => "1", mig_id(@dt3) => "1"},
+              :discussion_topics => {mig_id(@dt1) => "1"},
+              :announcements => {mig_id(@dt3) => "1"},
               :context_external_tools => {mig_id(@et) => "1"},
               :quizzes => {mig_id(@q1) => "1"},
               :learning_outcomes => {mig_id(@lo) => "1"},

spec/models/content_migration_spec.rb

@@ -399,7 +399,8 @@ def mig_id(obj)
 
       # only select one of each type
       @cm.copy_options = {
-              :discussion_topics => {mig_id(dt1) => "1", mig_id(dt3) => "1"},
+              :discussion_topics => {mig_id(dt1) => "1"},
+              :announcements => {mig_id(dt3) => "1"},
               :context_modules => {mig_id(cm) => "1", mig_id(cm2) => "0"},
               :attachments => {mig_id(att) => "1", mig_id(att2) => "0"},
               :wiki_pages => {mig_id(wiki) => "1", mig_id(wiki2) => "0"},
@@ -926,6 +927,19 @@ def create_outcome(context, group=nil)
       @copy_to.announcements.find_by_migration_id(mig_id(ann)).should_not be_nil
     end
 
+    it "should not copy announcements if not selected" do
+      ann = @copy_from.announcements.create!(:message => "howdy", :title => "announcement title")
+
+      @cm.copy_options = {
+          :all_discussion_topics => "1", :all_announcements => "0"
+      }
+      @cm.save!
+
+      run_course_copy
+
+      @copy_to.announcements.find_by_migration_id(mig_id(ann)).should be_nil
+    end
+
     it "should not copy deleted assignment attached to topic" do
       topic = @copy_from.discussion_topics.build(:title => "topic")
       assignment = @copy_from.assignments.build(:submission_types => 'discussion_topic', :title => topic.title)