removal of nil before remove_children

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1511214
jameswnl · Mar 2, 2018 · d456dec · d456dec
1 parent fb9e78a
commit d456dec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/mixins/relationship_mixin.rb b/app/models/mixins/relationship_mixin.rb
@@ -612,7 +612,7 @@ def remove_parent(parent)
   end
 
   def remove_children(*child_objs)
-    child_objs = child_objs.flatten
+    child_objs = child_objs.flatten.compact
     return child_objs if child_objs.empty?
 
     child_rels = self.child_rels

diff --git a/spec/models/mixins/relationship_mixin_spec.rb b/spec/models/mixins/relationship_mixin_spec.rb
@@ -9,6 +9,12 @@
   # host with no tree
   let(:host) { FactoryGirl.create(:host) }
 
+  describe "#remove_children" do
+    it "handles [nil]" do
+      expect { vms[3].remove_children(nil) }.to_not raise_error
+    end
+  end
+
   context "tree with relationship" do
     it "#with_relationship_type and #relationship_type" do
       expect(vms[0].relationship_type).not_to eq(test_rel_type)