bug fix for addChildView

marionettejs · May 23, 2019 · 182f757 · 182f757
1 parent 5090557
commit 182f757
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/collection-view.js b/src/collection-view.js
@@ -662,10 +662,8 @@ const CollectionView = Backbone.View.extend({
 
     if (_.isObject(index)) {
       options = index;
-    }
-
-    // If options has defined index we should use it
-    if (options.index != null) {
+      index = options.index;
+    } else if (options.index != null) {
       index = options.index;
     }
 

diff --git a/test/unit/collection-view/collection-view-children.spec.js b/test/unit/collection-view/collection-view-children.spec.js
@@ -260,6 +260,18 @@ describe('CollectionView Children', function() {
 
     });
 
+    describe('when called with options as second argument and without index in it', function() {
+      beforeEach(function() {
+        myCollectionView.addChildView(addView, { });
+      });
+
+      it('should add to the children container with undefined index', function() {
+        expect(myCollectionView.children._add)
+          .to.have.been.calledOnce.and.calledWith(addView, void 0);
+      });
+
+    });
+
     describe('when called without preventRender after preventReder calls', function() {
       const addIndex = 1;
       beforeEach(function() {