Fixed tests & added new ones

Author: voidgraphics

src/HasSlug.php

@@ -20,8 +20,9 @@ public static function bootHasSlug()
             if($model->attributeIsTranslatable($attribute)) {
                 $model->translateSlugs($attribute);
             } else {
-                if(!is_null($model->attributes[$attribute])) return;
+                if(!is_null($model->$attribute)) return;
 
+                $sluggable = $model->getSluggable();
                 $model->attributes[$attribute] = str_slug($model->$sluggable);
             }
         });
@@ -35,7 +36,9 @@ public static function bootHasSlug()
     public function translateSlugs($attribute)
     {
         $sluggable = $this->getSluggable();
-        $value = json_decode($this->attributes[$attribute], true);
+        $value = isset($this->attributes[$attribute])
+            ? json_decode($this->attributes[$attribute], true)
+            : [];
 
         foreach($this->getTranslatedLocales($this->getSluggable()) as $locale) {
             if(!isset($value[$locale]) || is_null($value[$locale])) {

tests/SluggableTest.php

@@ -11,6 +11,16 @@ public function test_it_saves_slug_on_model_save()
         $this->assertSame('my-test-title', $model->slug);
     }
 
+    public function test_it_does_not_overwrite_existing_slug()
+    {
+        $model = TestModel::create([
+            'title' => 'My test title',
+            'slug' => 'custom-slug'
+        ]);
+
+        $this->assertSame('custom-slug', $model->slug);
+    }
+
     public function test_it_saves_translated_slugs()
     {
         $model = TestModelTranslated::create([
@@ -25,6 +35,24 @@ public function test_it_saves_translated_slugs()
         $this->assertSame('mon-titre-test', $model->translate('slug', 'fr'));
     }
 
+    public function test_it_only_generates_missing_translated_slugs()
+    {
+        $model = TestModelTranslated::create([
+            'title' => [
+                'en' => 'My test title',
+                'fr' => 'Mon titre test'
+            ],
+            'slug' => [
+                'en' => null,
+                'fr' => 'custom-french-slug'
+            ]
+        ]);
+
+        $this->assertSame('{"en":"my-test-title","fr":"custom-french-slug"}', $model->getAttributes()['slug']);
+        $this->assertSame('my-test-title', $model->slug);
+        $this->assertSame('custom-french-slug', $model->translate('slug', 'fr'));
+    }
+
     public function test_can_override_sluggable_attribute()
     {
         $model = TestModelCustomAttribute::create(['title' => 'My test title']);