Improving/cleaning up tests

Author: rtconner

src/Taggable.php

@@ -130,16 +130,18 @@ public function tagSlugs(): array
      *
      * @param string|array|null $tagNames (or null to remove all tags)
      */
-    public function untag($tagNames=null)
+    public function untag($tagNames = null)
     {
         if(is_null($tagNames)) {
             $tagNames = $this->tagNames();
         }
 
         $tagNames = TaggingUtility::makeTagArray($tagNames);
 
+        dump($tagNames);
+
         foreach($tagNames as $tagName) {
-            $this->removeTag($tagName);
+            $this->removeSingleTag($tagName);
         }
 
         if(static::shouldDeleteUnused()) {
@@ -264,7 +266,7 @@ private function addTag($tagName)
      *
      * @param $tagName string
      */
-    private function removeTag($tagName)
+    private function removeSingleTag($tagName)
     {
         $tagName = trim($tagName);
 

src/TaggingUtility.php

@@ -242,7 +242,7 @@ public static function decrementCount($tagString, $tagSlug, $count)
     }
 
     /**
-     * Look at the tags table and delete any tags that are no londer in use by any taggable database rows.
+     * Look at the tags table and delete any tags that are no longer in use by any taggable database rows.
      * Does not delete tags where 'suggest' is true
      *
      * @return int

tests/CommonUsageTest.php

@@ -2,37 +2,10 @@
 
 namespace Tests;
 
-use Conner\Tagging\Contracts\TaggableContract;
-use Conner\Tagging\Taggable;
-use Illuminate\Database\Eloquent\Model as Eloquent;
-use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Collection;
 
 class CommonUsageTest extends TestCase
 {
-    use WithFaker;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->setUpFaker();
-
-        \Schema::create('books', function ($table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->timestamps();
-        });
-
-        Eloquent::unguard();
-    }
-
-    public function tearDown(): void
-    {
-        \Schema::drop('books');
-
-        parent::tearDown();
-    }
-
     public function test_tag_call()
     {
         $stub = $this->book();
@@ -189,24 +162,4 @@ function test_withoutTags()
         $this->assertCount(1, $list);
         $this->assertEquals($three->id, $list[0]->id);
     }
-
-    function book($attributes = []): Book
-    {
-        $attributes = array_merge(['name'=>$this->faker->name], $attributes);
-
-        return Book::create($attributes);
-    }
-}
-
-
-/**
- * @property string name
- */
-class Book extends Eloquent implements TaggableContract
-{
-    use Taggable;
-
-    protected $connection = 'testing';
-    protected static $unguarded = true;
-    public $table = 'books';
 }

tests/ConfigTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests;
+
+use Conner\Tagging\Model\Tag;
+
+class ConfigTest extends TestCase
+{
+    public function test_delete_unused_tags_true()
+    {
+        config(['tagging.delete_unused_tags'=>true]);
+        $book = $this->book();
+
+        $book->tag(['tag1', 'tag2', 'tag3']);
+        $book->untag();
+
+        $this->assertEmpty(Tag::all());
+    }
+
+    public function test_delete_unused_tags_false()
+    {
+        config(['tagging.delete_unused_tags'=>false]);
+        $book = $this->book();
+
+        $book->tag(['tag1', 'tag2', 'tag3']);
+        $book->untag();
+
+        $this->assertCount(3, Tag::all());
+    }
+}

tests/EventTests.php

@@ -2,30 +2,11 @@
 
 namespace Tests;
 
-use Conner\Tagging\Contracts\TaggableContract;
 use Conner\Tagging\Events\TagAdded;
 use Conner\Tagging\Events\TagRemoved;
-use Conner\Tagging\Taggable;
-use Illuminate\Database\Eloquent\Model as Eloquent;
-use Illuminate\Foundation\Testing\WithFaker;
 
 class EventTests extends TestCase
 {
-    use WithFaker;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->setUpFaker();
-
-        \Schema::create('books', function ($table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->timestamps();
-        });
-    }
-
     function test_tag_added()
     {
         \Event::listen(TagAdded::class, function(TagAdded $event){
@@ -50,23 +31,4 @@ function test_tag_removed()
 
         $book->untag('Test');
     }
-
-    function book($attributes = []): Book
-    {
-        $attributes = array_merge(['name'=>$this->faker->name], $attributes);
-
-        return Book::create($attributes);
-    }
 }
-
-/**
- * @property string name
- */
-class Book extends Eloquent implements TaggableContract
-{
-    use Taggable;
-
-    protected $connection = 'testing';
-    protected static $unguarded = true;
-    public $table = 'books';
-}

tests/TagGroupTest.php

@@ -2,23 +2,11 @@
 
 namespace Tests;
 
-use Illuminate\Database\Eloquent\Model as Eloquent;
 use Conner\Tagging\Model\Tag;
 use Conner\Tagging\Model\TagGroup;
-use Illuminate\Foundation\Testing\WithFaker;
 
 class TagGroupTest extends TestCase
 {
-    use WithFaker;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->setUpFaker();
-
-        Eloquent::unguard();
-    }
-
     public function test_create_group()
     {
         $tagGroup = $this->createTagGroup('MyTagGroup');

tests/TaggingUtilityTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Conner\Tagging\Model\Tag;
 use Conner\Tagging\TaggingUtility;
 use Illuminate\Support\Str;
 
@@ -102,4 +103,17 @@ public function test_displayize()
         config(['tagging.displayer' => function($str) { return 'bbb'; }]);
         $this->assertEquals('bbb', TaggingUtility::displayize('some string'));
     }
+
+    public function test_deleteUnusedTags()
+    {
+        config(['tagging.delete_unused_tags'=>false]);
+        $book = $this->book();
+
+        $book->tag(['tag1', 'tag2', 'tag3']);
+        $book->untag();
+
+        TaggingUtility::deleteUnusedTags();
+
+        $this->assertEmpty(Tag::all());
+    }
 }

tests/TestCase.php

@@ -2,10 +2,16 @@
 
 namespace Tests;
 
+use Conner\Tagging\Contracts\TaggableContract;
 use Conner\Tagging\Providers\TaggingServiceProvider;
+use Conner\Tagging\Taggable;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+use Illuminate\Foundation\Testing\WithFaker;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
+    use WithFaker;
+
     protected function getPackageProviders($app)
     {
         return [TaggingServiceProvider::class];
@@ -15,11 +21,19 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->setUpFaker();
+
         $this->artisan('migrate', [
             '--database' => 'testing',
             '--path' => realpath(__DIR__.'/../migrations'),
             '--realpath' => true,
         ]);
+
+        \Schema::create('books', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->timestamps();
+        });
     }
 
     /**
@@ -65,4 +79,23 @@ protected function assertArraysEqual(array $expected, array $actual, $regard_ord
 
         $this->assertEquals($expected, $actual);
     }
+
+    function book($attributes = []): Book
+    {
+        $attributes = array_merge(['name'=>$this->faker->name], $attributes);
+
+        return Book::create($attributes);
+    }
+}
+
+/**
+ * @property string name
+ */
+class Book extends Eloquent implements TaggableContract
+{
+    use Taggable;
+
+    protected $connection = 'testing';
+    protected static $unguarded = true;
+    public $table = 'books';
 }