Fixed lazychaser#51

Author: lazychaser

src/Node.php

@@ -750,6 +750,8 @@ protected function deleteDescendants()
 
             // In case if user wants to re-create the node
             $this->makeRoot();
+
+            static::$actionsPerformed++;
         }
     }
 

tests/NodeTest.php

@@ -25,6 +25,8 @@ public function setUp()
         $data = include __DIR__.'/data/categories.php';
 
         Capsule::table('categories')->insert($data);
+
+        Category::resetActionsPerformed();
     }
 
     public function tearDown()
@@ -250,7 +252,7 @@ public function testDescendants()
     {
         $node = $this->findCategory('mobile');
         $descendants = $node->descendants()->lists('name');
-        $expected = array('nokia', 'samsung', 'galaxy', 'sony');
+        $expected = array('nokia', 'samsung', 'galaxy', 'sony', 'lenovo');
 
         $this->assertEquals($expected, $descendants);
 
@@ -358,8 +360,6 @@ public function testSoftDeletedNodeisDeletedWhenParentIsDeleted()
 
         $this->assertTreeNotBroken();
 
-        $this->dumpTree();
-
         $this->assertNull($this->findCategory('samsung', true));
         $this->assertNull($this->findCategory('sony'));
     }
@@ -382,16 +382,16 @@ public function testSiblings()
         $next = $node->nextSiblings()->lists('id');
         $prev = $node->prevSiblings()->lists('id');
 
-        $this->assertEquals(array(6, 9), $siblings);
-        $this->assertEquals(array(9), $next);
+        $this->assertEquals(array(6, 9, 10), $siblings);
+        $this->assertEquals(array(9, 10), $next);
         $this->assertEquals(array(6), $prev);
 
         $siblings = $node->getSiblings()->lists('id');
         $next = $node->getNextSiblings()->lists('id');
         $prev = $node->getPrevSiblings()->lists('id');
 
-        $this->assertEquals(array(6, 9), $siblings);
-        $this->assertEquals(array(9), $next);
+        $this->assertEquals(array(6, 9, 10), $siblings);
+        $this->assertEquals(array(9, 10), $next);
         $this->assertEquals(array(6), $prev);
 
         $next = $node->getNextSibling();
@@ -417,7 +417,7 @@ public function testToTreeBuildsWithDefaultOrder()
 
         $root = $tree->first();
         $this->assertEquals('mobile', $root->name);
-        $this->assertEquals(3, count($root->children));
+        $this->assertEquals(4, count($root->children));
     }
 
     public function testToTreeBuildsWithCustomOrder()
@@ -431,7 +431,7 @@ public function testToTreeBuildsWithCustomOrder()
 
         $root = $tree->first();
         $this->assertEquals('mobile', $root->name);
-        $this->assertEquals(3, count($root->children));
+        $this->assertEquals(4, count($root->children));
         $this->assertEquals($root, $root->children->first()->parent);
     }
 
@@ -443,8 +443,8 @@ public function testToTreeWithSpecifiedRoot()
         $tree1 = \Kalnoy\Nestedset\Collection::make($nodes)->toTree(5);
         $tree2 = \Kalnoy\Nestedset\Collection::make($nodes)->toTree($node);
 
-        $this->assertEquals(3, $tree1->count());
-        $this->assertEquals(3, $tree2->count());
+        $this->assertEquals(4, $tree1->count());
+        $this->assertEquals(4, $tree2->count());
     }
 
     public function testToTreeBuildsWithDefaultOrderAndMultipleRootNodes()
@@ -458,7 +458,7 @@ public function testToTreeBuildsWithRootItemIdProvided()
     {
         $tree = Category::whereBetween('_lft', array(8, 17))->get()->toTree(5);
 
-        $this->assertEquals(3, count($tree));
+        $this->assertEquals(4, count($tree));
 
         $root = $tree[1];
         $this->assertEquals('samsung', $root->name);
@@ -501,7 +501,7 @@ public function testDefaultCategoryIsSavedAsRoot()
         $node = new Category([ 'name' => 'test' ]);
         $node->save();
 
-        $this->assertEquals(19, $node->_lft);
+        $this->assertEquals(21, $node->_lft);
         $this->assertTreeNotBroken();
 
         $this->assertTrue($node->isRoot());
@@ -545,7 +545,7 @@ public function testCreatesNode()
     {
         $node = Category::create([ 'name' => 'test' ]);
 
-        $this->assertEquals(19, $node->getLft());
+        $this->assertEquals(21, $node->getLft());
     }
 
     public function testCreatesViaRelationship()
@@ -604,4 +604,16 @@ public function testDescendantsByNode()
 
         $this->assertEquals([ 3, 4 ], $res);
     }
+
+    public function testMultipleDeletionsDoNotBrakeTree()
+    {
+        $category = $this->findCategory('mobile');
+
+        foreach ($category->children()->take(2)->get() as $child)
+        {
+            $child->forceDelete();
+        }
+
+        $this->assertTreeNotBroken();
+    }
 }

tests/data/categories.php

@@ -1,13 +1,14 @@
 <?php
 
 return array(
-    array('id' => 1, 'name' => 'store', '_lft' => 1, '_rgt' => 18, 'parent_id' => null),
+    array('id' => 1, 'name' => 'store', '_lft' => 1, '_rgt' => 20, 'parent_id' => null),
         array('id' => 2, 'name' => 'notebooks', '_lft' => 2, '_rgt' => 7, 'parent_id' => 1),
             array('id' => 3, 'name' => 'apple', '_lft' => 3, '_rgt' => 4, 'parent_id' => 2),
             array('id' => 4, 'name' => 'lenovo', '_lft' => 5, '_rgt' => 6, 'parent_id' => 2),
-        array('id' => 5, 'name' => 'mobile', '_lft' => 8, '_rgt' => 17, 'parent_id' => 1),
+        array('id' => 5, 'name' => 'mobile', '_lft' => 8, '_rgt' => 19, 'parent_id' => 1),
             array('id' => 6, 'name' => 'nokia', '_lft' => 9, '_rgt' => 10, 'parent_id' => 5),
             array('id' => 7, 'name' => 'samsung', '_lft' => 11, '_rgt' => 14, 'parent_id' => 5),
                 array('id' => 8, 'name' => 'galaxy', '_lft' => 12, '_rgt' => 13, 'parent_id' => 7),
             array('id' => 9, 'name' => 'sony', '_lft' => 15, '_rgt' => 16, 'parent_id' => 5),
+            array('id' => 10, 'name' => 'lenovo', '_lft' => 17, '_rgt' => 18, 'parent_id' => 5),
 );

tests/models/Category.php

@@ -7,4 +7,9 @@ class Category extends Kalnoy\Nestedset\Node {
     protected $fillable = array('name', 'parent_id');
 
     public $timestamps = false;
+
+    public static function resetActionsPerformed()
+    {
+        static::$actionsPerformed = 0;
+    }
 }