Updating the tests

Author: arcanedev-maroc

tests/GravatarServiceProviderTest.php

@@ -1,4 +1,5 @@
 <?php namespace Arcanedev\Gravatar\Tests;
+
 use Arcanedev\Gravatar\GravatarServiceProvider;
 
 /**
@@ -24,26 +25,43 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->provider = new GravatarServiceProvider($this->app);
+        $this->provider = $this->app->getProvider(GravatarServiceProvider::class);
     }
 
     public function tearDown()
     {
-        parent::tearDown();
-
         unset($this->provider);
+
+        parent::tearDown();
     }
 
     /* ------------------------------------------------------------------------------------------------
      |  Test Functions
      | ------------------------------------------------------------------------------------------------
      */
     /** @test */
-    public function it_can_get_what_it_provides()
+    public function it_can_be_instantiated()
     {
-        $this->assertEquals(
-            ['arcanedev.gravatar'],
-            $this->provider->provides()
-        );
+        $expectations = [
+            \Illuminate\Support\ServiceProvider::class,
+            \Arcanedev\Support\ServiceProvider::class,
+            \Arcanedev\Support\PackageServiceProvider::class,
+            \Arcanedev\Gravatar\GravatarServiceProvider::class,
+        ];
+
+        foreach ($expectations as $expected) {
+            $this->assertInstanceOf($expected, $this->provider);
+        }
+    }
+
+    /** @test */
+    public function it_can_provides()
+    {
+        $expected = [
+            'arcanedev.gravatar',
+            \Arcanedev\Gravatar\Contracts\Gravatar::class,
+        ];
+
+        $this->assertEquals($expected, $this->provider->provides());
     }
 }

tests/GravatarTest.php

@@ -14,7 +14,7 @@ class GravatarTest extends TestCase
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /** @var Gravatar */
+    /** @var \Arcanedev\Gravatar\Gravatar */
     private $gravatar;
 
     /* ------------------------------------------------------------------------------------------------
@@ -25,14 +25,14 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->gravatar = $this->app['arcanedev.gravatar'];
+        $this->gravatar = $this->app->make('arcanedev.gravatar');
     }
 
     public function tearDown()
     {
-        parent::tearDown();
-
         unset($this->gravatar);
+
+        parent::tearDown();
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -42,10 +42,15 @@ public function tearDown()
     /** @test */
     public function it_can_be_instantiated()
     {
-        $this->assertInstanceOf(Gravatar::class, $this->gravatar);
-        $this->assertEquals('g', $this->gravatar->getRating());
-        $this->assertEquals(80, $this->gravatar->getSize());
-        $this->assertTrue($this->gravatar->isSecured());
+        $this->assertGravatarInstance($this->gravatar);
+
+        // By a helper function
+        $this->assertGravatarInstance(gravatar());
+
+        // By a Contract
+        $this->assertGravatarInstance(
+            $this->app->make(\Arcanedev\Gravatar\Contracts\Gravatar::class)
+        );
     }
 
     /** @test */
@@ -272,4 +277,21 @@ public function it_can_set_size_from_height_or_width_attributes()
 
         $this->assertEquals(256, $this->gravatar->getSize());
     }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Assert the gravatar instance.
+     *
+     * @param  \Arcanedev\Gravatar\Contracts\Gravatar  $gravatar
+     */
+    public function assertGravatarInstance($gravatar)
+    {
+        $this->assertInstanceOf(\Arcanedev\Gravatar\Gravatar::class, $gravatar);
+        $this->assertEquals('g', $gravatar->getRating());
+        $this->assertEquals(80, $gravatar->getSize());
+        $this->assertTrue($gravatar->isSecured());
+    }
 }

tests/Helpers/HtmlBuilderTest.php

@@ -11,20 +11,6 @@
  */
 class HtmlBuilderTest extends TestCase
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
-     */
-    public function setUp()
-    {
-        parent::setUp();
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
-
     /* ------------------------------------------------------------------------------------------------
      |  Test Functions
      | ------------------------------------------------------------------------------------------------

tests/TestCase.php

@@ -60,6 +60,6 @@ protected function getPackageAliases($app)
      */
     protected function getEnvironmentSetUp($app)
     {
-
+        //
     }
 }