Improve testing setup, tidy up cert generation

app/Porter.php

@@ -9,6 +9,7 @@
 use App\Support\Contracts\Cli;
 use App\Support\Contracts\ImageRepository;
 use App\Support\Contracts\ImageSetRepository;
+use App\Support\Images\Image;
 
 class Porter
 {
@@ -195,16 +196,6 @@ public function build()
         $this->dockerCompose->command('build')->perform();
     }
 
-    /**
-     * Pull our docker images
-     */
-    public function pullImages()
-    {
-        foreach ($this->getDockerImageSet()->all() as $image) {
-            $this->cli->passthru("docker pull {$image->name}");
-        }
-    }
-
     /**
      * Build the current images
      */
@@ -225,6 +216,33 @@ public function pushImages()
         }
     }
 
+    /**
+     * Pull our docker images
+     */
+    public function pullImages()
+    {
+        foreach ($this->getDockerImageSet()->all() as $image) {
+            if (running_tests() && $this->hasImage($image)) {
+                continue;
+            }
+
+            $this->cli->passthru("docker pull {$image->name}");
+        }
+    }
+
+    /**
+     * Check if we already have the image
+     *
+     * @param Image $image
+     * @return bool
+     */
+    public function hasImage(Image $image)
+    {
+        $output = $this->cli->exec("docker image inspect {$image->name}");
+
+        return strpos($output, "Error: No such image: {$image->name}") === false;
+    }
+
     /**
      * Get the current image set to use.
      *

app/Support/Mechanics/Untrained.php

@@ -63,7 +63,7 @@ public function getUserHomePath()
      */
     public function isTesting()
     {
-        return config('app.env') == 'testing';
+        return running_tests();
     }
 
     /**

app/Support/Ssl/CertificateBuilder.php

@@ -88,7 +88,7 @@ public function createCa()
         }
 
         exec(sprintf(
-            'openssl req -new -newkey rsa:2048 -days 730 -nodes -x509 -subj "/C=/ST=/O=%s/localityName=/commonName=%s/organizationalUnitName=Developers/emailAddress=%s/" -keyout %s -out %s',
+            'openssl req -new -newkey rsa:2048 -days 730 -nodes -x509 -subj "/C=GB/ST=Berks/O=%s/localityName=Reading/commonName=%s/organizationalUnitName=Developers/emailAddress=%s/" -keyout %s -out %s',
             $this->oName, $this->cName, $this->email, $paths->key, $paths->pem
         ));
 
@@ -158,8 +158,8 @@ public function createPrivateKey($keyPath)
     public function createSigningRequest($url, $keyPath, $csrPath, $confPath)
     {
         exec(sprintf(
-            'openssl req -new -key %s -out %s -subj "/C=/ST=/O=/localityName=/commonName=%s/organizationalUnitName=/emailAddress=%s%s/" -config %s',
-            $keyPath, $csrPath, $url, $url, '@'.$this->domain, $confPath
+            'openssl req -new -key %s -out %s -subj "/C=GB/ST=Berks/O=%s/localityName=Reading/commonName=%s/organizationalUnitName=Developers/emailAddress=%s%s/" -config %s',
+            $keyPath, $csrPath, $this->domain, $url, $url, '@'.$this->domain, $confPath
         ));
     }
 

app/Support/helpers.php

@@ -18,3 +18,11 @@ function setting($key = null, $default = null)
 
     return Setting::where('name', $key)->value('value') ?? $default;
 }
+
+/**
+ * Check if we're running tests since environment is limited to production/development
+ */
+function running_tests()
+{
+    return config('app.running_tests');
+}

config/app.php

@@ -54,5 +54,8 @@
         \Illuminate\View\ViewServiceProvider::class,
     ],
 
-    'env' => env('APP_ENV', 'local'),
+    /**
+     * Since environment is limited to production/development, add a flag for tests.
+     */
+    'running_tests' => env('RUNNING_TESTS', false),
 ];

phpunit.xml

@@ -6,22 +6,20 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         defaultTestSuite="Unit"
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
+        <testsuite name="Live">
+            <directory suffix="Test.php">./tests/Live</directory>
+        </testsuite>
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
     </testsuites>
-    <groups>
-        <exclude>
-            <group>docker</group>
-            <group>certificates</group>
-        </exclude>
-    </groups>
     <listeners>
         <listener class="NunoMaduro\Collision\Adapters\Phpunit\Listener"/>
     </listeners>
@@ -31,7 +29,7 @@
         </whitelist>
     </filter>
     <php>
-        <env name="APP_ENV" value="testing"/>
+        <env name="RUNNING_TESTS" value="true"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>

resources/views/ssl/conf.blade.php

@@ -1,17 +1,17 @@
-[req]
+[ req]
 distinguished_name = req_distinguished_name
 req_extensions = v3_req
 
 [req_distinguished_name]
 countryName = Country Name (2 letter code)
-countryName_default = US
+countryName_default = GB
 stateOrProvinceName = State or Province Name (full name)
-stateOrProvinceName_default = MN
+stateOrProvinceName_default = Berks
 localityName = Locality Name (eg, city)
-localityName_default = Minneapolis
-organizationalUnitName	= Organizational Unit Name (eg, section)
-organizationalUnitName_default	= Domain Control Validated
-commonName = Internet Widgits Ltd
+localityName_default = Reading
+organizationalUnitName = Organizational Unit Name (eg, section)
+organizationalUnitName_default = Developers
+commonName = {{ $url }}
 commonName_max	= 64
 
 [ v3_req ]

tests/BaseTestCase.php

@@ -2,14 +2,14 @@
 
 namespace Tests;
 
-use App\Providers\AppServiceProvider;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\TestCase as IlluminateTestCase;
+use Illuminate\Support\Facades\Artisan;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
 abstract class BaseTestCase extends IlluminateTestCase
 {
-    use CreatesApplication, MockeryPHPUnitIntegration, DatabaseMigrations;
+    use CreatesApplication, MockeryPHPUnitIntegration, DatabaseTransactions;
 
     /**
      * Holds an application instance.
@@ -27,16 +27,18 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (static::$migrated) {
-            return;
-        }
+        $this->afterApplicationCreated(function () {
+            if (static::$migrated) {
+                return;
+            }
 
-        $this->performMigrations();
+            Artisan::call('migrate:fresh');
 
-        static::$migrated = true;
+            $this->preparePorter();
+        });
     }
 
-    protected function performMigrations()
+    protected function preparePorter()
     {
 
     }

tests/Feature/ProviderBaseTest.php

@@ -3,8 +3,9 @@
 namespace Tests\Feature;
 
 use App\Support\Ssl\CertificateBuilder;
+use Tests\BaseTestCase;
 
-class ProviderBaseTest extends \Tests\BaseTestCase
+class ProviderBaseTest extends BaseTestCase
 {
     /** @test */
     public function it_passes_the_correct_ssl_directory_to_the_certificate_builder()

tests/Live/PorterServesSitesTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Live;
+
+use Illuminate\Support\Facades\Artisan;
+use Tests\LiveTestCase;
+
+class PorterServesSitesTest extends LiveTestCase
+{
+    /** @test */
+    public function porter_makes_the_sample_site_available()
+    {
+        Artisan::call('site:unsecure', ['site' => 'sample']);
+
+        $phpinfo = $this->get('http://sample.test');
+
+        $this->assertContains('php', $phpinfo);
+    }
+
+    /**
+     * @test
+     */
+    public function porter_makes_the_sample_site_available_securely()
+    {
+        Artisan::call('site:secure', ['site' => 'sample']);
+
+        $phpinfo = $this->get('https://sample.test');
+
+        $this->assertContains('php', $phpinfo);
+    }
+}

tests/Feature/PorterServesSitesTest.php → tests/LiveTestCase.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests;
 
 use App\Porter;
 use Illuminate\Support\Facades\Artisan;
-use Tests\BaseTestCase;
 
-class PorterServesSitesTest extends BaseTestCase
+class LiveTestCase extends BaseTestCase
 {
     /** @var Porter */
     protected $porter;
@@ -17,8 +16,6 @@ public function setUp() :void
 
         $this->porter = app(Porter::class);
 
-        Artisan::call('begin', ['home' => __DIR__.'/../TestWebRoot', '--force' => true]);
-
         Artisan::call('start');
 
         $this->assertTrue($this->porter->isUp(), 'Porter could not start.');
@@ -33,27 +30,9 @@ public function tearDown()
         parent::tearDown();
     }
 
-    /**
-     * @test
-     * @group docker
-     */
-    public function porter_makes_the_sample_site_available()
+    protected function preparePorter()
     {
-        Artisan::call('site:unsecure', ['site' => 'sample']);
-
-        $phpinfo = $this->get('http://sample.test');
-
-        $this->assertContains('php', $phpinfo);
-    }
-
-    protected function buildResolveOption($url)
-    {
-        $scheme = parse_url($url, PHP_URL_SCHEME);
-        $host = parse_url($url, PHP_URL_HOST);
-
-        $port = $scheme == 'http' ? 80 : 443;
-
-        return ["{$host}:{$port}:127.0.0.1"];
+        Artisan::call('begin', ['home' => __DIR__.'/TestWebRoot', '--force' => true]);
     }
 
     /**
@@ -71,6 +50,9 @@ public function get($url, array $headers = [])
         // force it to resolve to 127.0.0.1
         curl_setopt($ch, CURLOPT_RESOLVE, $this->buildResolveOption($url));
 
+        // Since the cert won't be trusted, ignore it
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
         $phpinfo = curl_exec($ch);
 
         if (curl_errno($ch)) {
@@ -80,4 +62,14 @@ public function get($url, array $headers = [])
 
         return $phpinfo;
     }
+
+    protected function buildResolveOption($url)
+    {
+        $scheme = parse_url($url, PHP_URL_SCHEME);
+        $host = parse_url($url, PHP_URL_HOST);
+
+        $port = $scheme == 'http' ? 80 : 443;
+
+        return ["{$host}:{$port}:127.0.0.1"];
+    }
 }

tests/Unit/PhpVersionBaseTest.php → tests/Unit/PhpVersionTest.php

@@ -6,7 +6,7 @@
 use App\Models\Site;
 use Tests\BaseTestCase;
 
-class PhpVersionBaseTest extends BaseTestCase
+class PhpVersionTest extends BaseTestCase
 {
     /** @test */
     public function it_returns_a_safe_version_number()