Merge pull request #56 from codedge/improve-test-coverage

Improve tests

Author: codedge

composer.json

@@ -54,8 +54,8 @@
     "guzzlehttp/guzzle": "6.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7",
-    "orchestra/testbench": "3.7.*",
-    "mockery/mockery": "^0.9.5"
+    "phpunit/phpunit": "^7.0",
+    "mockery/mockery": "^0.9.5",
+    "orchestra/testbench": "~3.4.2|~3.5.0|~3.6.0|~3.7.0"
   }
 }

composer.lock

@@ -8,7 +8,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
 
     <testsuites>
         <testsuite name="Laravel Application Self-Updater Test Suite">
@@ -22,4 +22,4 @@
         </whitelist>
     </filter>
 
-</phpunit>
+</phpunit>

phpunit.xml.dist

@@ -4,6 +4,7 @@
 
 use Closure;
 use GuzzleHttp\Client;
+use InvalidArgumentException;
 use Illuminate\Foundation\Application;
 use Codedge\Updater\Contracts\UpdaterContract;
 use Codedge\Updater\Contracts\SourceRepositoryTypeContract;
@@ -114,9 +115,13 @@ public function __call($method, $parameters)
      *
      * @return array
      */
-    protected function getConfig($name)
+    protected function getConfig(string $name): array
     {
-        return $this->app['config']['self-update']['repository_types'][$name];
+        if (isset($this->app['config']['self-update']['repository_types'][$name])) {
+            return $this->app['config']['self-update']['repository_types'][$name];
+        }
+
+        return [];
     }
 
     /**
@@ -144,7 +149,7 @@ protected function resolve($name)
     {
         $config = $this->getConfig($name);
 
-        if (is_null($config)) {
+        if (empty($config)) {
             throw new InvalidArgumentException("Source repository [{$name}] is not defined.");
         }
 

src/UpdaterManager.php

@@ -9,10 +9,9 @@
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Exception\RequestException;
-use Mockery;
-use Psr\Http\Message\StreamInterface;
+use Illuminate\Support\Facades\Storage;
+use InvalidArgumentException;
+use Exception;
 
 class GithubRepositoryTypeTest extends TestCase
 {
@@ -63,16 +62,10 @@ public function setUp()
         );
     }
 
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close();
-    }
-
     public function testIsNewVersionAvailableFailsWithInvalidArgumentException()
     {
         $class = new GithubRepositoryType($this->client, $this->config);
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $class->isNewVersionAvailable();
     }
 
@@ -81,6 +74,8 @@ public function testIsNewVersionAvailableTriggerUpdateAvailableEvent()
         $class = new GithubRepositoryType($this->client, $this->config);
         $currentVersion = 'v1.1.0';
 
+        Storage::delete(GithubRepositoryType::NEW_VERSION_FILE);
+
         $this->expectsEvents(UpdateAvailable::class);
         $this->assertTrue($class->isNewVersionAvailable($currentVersion));
     }
@@ -108,7 +103,7 @@ public function testGetVersionAvailable()
     public function testFetchingFailsWithException()
     {
         $class = new GithubRepositoryType($this->client, $this->config);
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $class->fetch();
     }
-}
+}

tests/SourceRepositoryTypes/GithubRepositoryTypeTest.php

@@ -1,19 +1,20 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Codedge\Updater\Tests;
 
 use Codedge\Updater\UpdaterFacade;
 use Codedge\Updater\UpdaterServiceProvider;
-use GuzzleHttp\Client;
 use Illuminate\Foundation\Application;
-use Orchestra\Testbench\TestCase as BaseTestCase;
+use Orchestra\Testbench\TestCase as Orchestra;
 
-class TestCase extends BaseTestCase
+abstract class TestCase extends Orchestra
 {
     protected $client;
 
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param Application $app
+     *
+     * @return void
      */
     protected function getEnvironmentSetUp($app)
     {
@@ -28,6 +29,12 @@ protected function getEnvironmentSetUp($app)
                     'repository_url' => '',
                     'download_path' => '/tmp',
                 ],
+                'http' => [
+                    'type' => 'http',
+                    'repository_url' => env('SELF_UPDATER_REPO_URL', ''),
+                    'pkg_filename_format' => env('SELF_UPDATER_PKG_FILENAME_FORMAT', 'v_VERSION_'),
+                    'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
+                ],
             ],
             'log_events' => false,
             'mail_to' => [
@@ -58,4 +65,4 @@ protected function getPackageAliases($app)
             'Updater' => UpdaterFacade::class,
         ];
     }
-}
+}

tests/TestCase.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types=1);
+
+namespace Codedge\Updater\Tests;
+
+use Codedge\Updater\SourceRepository;
+use Codedge\Updater\UpdaterManager;
+use InvalidArgumentException;
+
+class UpdaterManagerTest extends Testcase
+{
+    public function test_can_be_instantiated()
+    {
+        $manager = new UpdaterManager(app());
+
+        $this->assertInstanceOf(UpdaterManager::class, $manager);
+    }
+
+    public function test_get_source_repository_with_name_github()
+    {
+        $manager = new UpdaterManager(app());
+        $result = $manager->source('github');
+
+        $this->assertInstanceOf(SourceRepository::class, $result);
+    }
+
+    public function test_get_source_repository_with_name_http()
+    {
+        $manager = new UpdaterManager(app());
+        $result = $manager->source('http');
+
+        $this->assertInstanceOf(SourceRepository::class, $result);
+    }
+
+    public function test_get_source_repository_with_default_name()
+    {
+        $manager = new UpdaterManager(app());
+        $result = $manager->source();
+
+        $this->assertInstanceOf(SourceRepository::class, $result);
+    }
+
+    public function test_get_source_repository_with_not_existing_name()
+    {
+        $manager = new UpdaterManager(app());
+
+        $this->expectException(InvalidArgumentException::class);
+        $manager->source('test');
+    }
+}