slug should have a consecutive number

fixes NightJar#11 1 12 123 isn't that consecutive, is it?
wernerkrauss · Apr 29, 2020 · 00cee2c · 00cee2c
1 parent 974fa9f
commit 00cee2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Slug.php b/src/Slug.php
@@ -180,8 +180,9 @@ public function onBeforeWrite()
             }
 
             $count = 1;
+            $origSlug = $owner->URLSlug;
             while ($collisionList->filter($filter)->exists()) {
-                $owner->URLSlug = implode('-', [$owner->URLSlug,  $count++]);
+                $owner->URLSlug = implode('-', [$origSlug,  $count++]);
                 $filter['URLSlug'] = $owner->URLSlug;
             }
         } elseif ($slugHasChanged) {

diff --git a/tests/SlugTest.php b/tests/SlugTest.php
@@ -92,9 +92,17 @@ public function testSlugCollisionsCorrectThemselves()
             'Title' => 'First news',
             'ParentID' => $newsPage->ID,
         ]);
-        $newArticle->extend('onBeforeWrite');
+        $newArticle->write();
         $this->assertEquals('first-news-1', $newArticle->URLSlug);
         $this->assertEquals('First news', $newArticle->Title);
+
+        $anotherArticle = Article::create()->update([
+            'Title' => 'First news',
+            'ParentID' => $newsPage->ID,
+        ]);
+        $anotherArticle->write();
+        $this->assertEquals('first-news-2', $anotherArticle->URLSlug);
+        $this->assertEquals('First news', $anotherArticle->Title);
     }
 
     /**