Merge pull request #2 from cybercog/hotfix/missing-tests

Add missing unit tests. Fix tests methods naming

Author: Pe Ell

README.md

@@ -13,7 +13,7 @@ Eloquent flagged attributes behavior. Add commonly used flags to models very qui
 
 Eloquent Flag is an easy way to add flagged attributes to eloquent models. All flags has their own trait which adds global scopes to desired entity.
 
-The main logic of the flags: If flag is `false` - entity should be hidden from the query results. Omitted entities could be retrieved by using a global scope methods.  
+The main logic of the flags: If flag is `false` - entity should be hidden from the query results. Omitted entities could be retrieved by using special global scope methods.  
 
 ## Available flags list
 

tests/unit/Scopes/ActiveFlagScopeTest.php

@@ -51,6 +51,21 @@ public function it_can_get_without_inactive()
         $this->assertCount(3, $entities);
     }
 
+    /** @test */
+    public function it_can_get_with_inactive()
+    {
+        factory(EntityWithActiveFlag::class, 3)->create([
+            'is_active' => true,
+        ]);
+        factory(EntityWithActiveFlag::class, 2)->create([
+            'is_active' => false,
+        ]);
+
+        $entities = EntityWithActiveFlag::withInactive()->get();
+
+        $this->assertCount(5, $entities);
+    }
+
     /** @test */
     public function it_can_get_only_inactive()
     {
@@ -69,28 +84,28 @@ public function it_can_get_only_inactive()
     /** @test */
     public function it_can_activate_model()
     {
-        $method = factory(EntityWithActiveFlag::class)->create([
+        $model = factory(EntityWithActiveFlag::class)->create([
             'is_active' => false,
         ]);
 
-        EntityWithActiveFlag::where('id', $method->id)->activate();
+        EntityWithActiveFlag::where('id', $model->id)->activate();
 
-        $method = EntityWithActiveFlag::where('id', $method->id)->first();
+        $model = EntityWithActiveFlag::where('id', $model->id)->first();
 
-        $this->assertTrue($method->is_active);
+        $this->assertTrue($model->is_active);
     }
 
     /** @test */
     public function it_can_deactivate_model()
     {
-        $method = factory(EntityWithActiveFlag::class)->create([
+        $model = factory(EntityWithActiveFlag::class)->create([
             'is_active' => true,
         ]);
 
-        EntityWithActiveFlag::where('id', $method->id)->deactivate();
+        EntityWithActiveFlag::where('id', $model->id)->deactivate();
 
-        $method = EntityWithActiveFlag::withInactive()->where('id', $method->id)->first();
+        $model = EntityWithActiveFlag::withInactive()->where('id', $model->id)->first();
 
-        $this->assertFalse($method->is_active);
+        $this->assertFalse($model->is_active);
     }
 }

tests/unit/Scopes/KeptFlagScopeTest.php

@@ -51,6 +51,21 @@ public function it_can_get_without_unkept()
         $this->assertCount(3, $entities);
     }
 
+    /** @test */
+    public function it_can_get_with_unkept()
+    {
+        factory(EntityWithKeptFlag::class, 3)->create([
+            'is_kept' => true,
+        ]);
+        factory(EntityWithKeptFlag::class, 2)->create([
+            'is_kept' => false,
+        ]);
+
+        $entities = EntityWithKeptFlag::withUnkept()->get();
+
+        $this->assertCount(5, $entities);
+    }
+
     /** @test */
     public function it_can_get_only_unkept()
     {
@@ -69,28 +84,28 @@ public function it_can_get_only_unkept()
     /** @test */
     public function it_can_keep_model()
     {
-        $method = factory(EntityWithKeptFlag::class)->create([
+        $model = factory(EntityWithKeptFlag::class)->create([
             'is_kept' => false,
         ]);
 
-        EntityWithKeptFlag::where('id', $method->id)->keep();
+        EntityWithKeptFlag::where('id', $model->id)->keep();
 
-        $method = EntityWithKeptFlag::where('id', $method->id)->first();
+        $model = EntityWithKeptFlag::where('id', $model->id)->first();
 
-        $this->assertTrue($method->is_kept);
+        $this->assertTrue($model->is_kept);
     }
 
     /** @test */
-    public function it_can_deactivate_model()
+    public function it_can_unkeep_model()
     {
-        $method = factory(EntityWithKeptFlag::class)->create([
+        $model = factory(EntityWithKeptFlag::class)->create([
             'is_kept' => true,
         ]);
 
-        EntityWithKeptFlag::where('id', $method->id)->unkeep();
+        EntityWithKeptFlag::where('id', $model->id)->unkeep();
 
-        $method = EntityWithKeptFlag::withUnkept()->where('id', $method->id)->first();
+        $model = EntityWithKeptFlag::withUnkept()->where('id', $model->id)->first();
 
-        $this->assertFalse($method->is_kept);
+        $this->assertFalse($model->is_kept);
     }
 }

tests/unit/Scopes/PublishedFlagScopeTest.php

@@ -22,7 +22,7 @@
 class PublishedFlagScopeTest extends TestCase
 {
     /** @test */
-    public function it_can_get_only_active()
+    public function it_can_get_only_published()
     {
         factory(EntityWithPublishedFlag::class, 3)->create([
             'is_published' => true,
@@ -37,7 +37,7 @@ public function it_can_get_only_active()
     }
 
     /** @test */
-    public function it_can_get_without_inactive()
+    public function it_can_get_without_unpublished()
     {
         factory(EntityWithPublishedFlag::class, 3)->create([
             'is_published' => true,
@@ -52,7 +52,22 @@ public function it_can_get_without_inactive()
     }
 
     /** @test */
-    public function it_can_get_only_inactive()
+    public function it_can_get_with_unpublished()
+    {
+        factory(EntityWithPublishedFlag::class, 3)->create([
+            'is_published' => true,
+        ]);
+        factory(EntityWithPublishedFlag::class, 2)->create([
+            'is_published' => false,
+        ]);
+
+        $entities = EntityWithPublishedFlag::withUnpublished()->get();
+
+        $this->assertCount(5, $entities);
+    }
+
+    /** @test */
+    public function it_can_get_only_unpublished()
     {
         factory(EntityWithPublishedFlag::class, 3)->create([
             'is_published' => true,
@@ -67,30 +82,30 @@ public function it_can_get_only_inactive()
     }
 
     /** @test */
-    public function it_can_activate_model()
+    public function it_can_publish_model()
     {
-        $method = factory(EntityWithPublishedFlag::class)->create([
+        $model = factory(EntityWithPublishedFlag::class)->create([
             'is_published' => false,
         ]);
 
-        EntityWithPublishedFlag::where('id', $method->id)->publish();
+        EntityWithPublishedFlag::where('id', $model->id)->publish();
 
-        $method = EntityWithPublishedFlag::where('id', $method->id)->first();
+        $model = EntityWithPublishedFlag::where('id', $model->id)->first();
 
-        $this->assertTrue($method->is_published);
+        $this->assertTrue($model->is_published);
     }
 
     /** @test */
-    public function it_can_deactivate_model()
+    public function it_can_unpublish_model()
     {
-        $method = factory(EntityWithPublishedFlag::class)->create([
+        $model = factory(EntityWithPublishedFlag::class)->create([
             'is_published' => true,
         ]);
 
-        EntityWithPublishedFlag::where('id', $method->id)->unpublish();
+        EntityWithPublishedFlag::where('id', $model->id)->unpublish();
 
-        $method = EntityWithPublishedFlag::withUnpublished()->where('id', $method->id)->first();
+        $model = EntityWithPublishedFlag::withUnpublished()->where('id', $model->id)->first();
 
-        $this->assertFalse($method->is_published);
+        $this->assertFalse($model->is_published);
     }
 }