Add GuzzleHarness and use it

3 files changed, 47 insertions, 30 deletions

diff --git a/app/helpers.php b/app/helpers.php
index 56d8eba..3bce65f 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -50,6 +50,26 @@ function is_installed()
  * @param  string $comment
  * @return string
  */
-function _g($str, $comment='') {
+function _g($str, $comment='')
+{
     return Simplel10n::getString($str, $comment);
+}
+
+/**
+ * Reset the moonmoon instance.
+ */
+function removeCustomFiles()
+{
+    $toRemove = [
+        custom_path('config.yml'),
+        custom_path('people.opml'),
+        custom_path('people.opml.bak'),
+        custom_path('cache')
+    ];
+
+    foreach ($toRemove as $path) {
+        if (file_exists($path)) {
+            unlink($path);
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/GuzzleHarness.php b/tests/GuzzleHarness.php
new file mode 100644
index 0000000..a3f2ac4
--- /dev/null
+++ b/tests/GuzzleHarness.php
@@ -0,0 +1,20 @@
+<?php
+
+use \PHPUnit\Framework\TestCase;
+use \GuzzleHttp\Client;
+
+class GuzzleHarness extends TestCase
+{
+
+    /** @var GuzzleHttp\Client */
+    protected $client = null;
+
+    public function setUp()
+    {
+        $this->client = new Client([
+            'base_uri' => 'http://127.0.0.1:8081',
+            'timeout' => 1,
+        ]);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/InstallTest.php b/tests/InstallTest.php
index f37f28c..7615f18 100644
--- a/tests/InstallTest.php
+++ b/tests/InstallTest.php
@@ -1,42 +1,19 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
-use GuzzleHttp\Client;
+require_once 'GuzzleHarness.php';
 
-class InstallTest extends TestCase {
-
-    /** @var GuzzleHttp\Client */
-    protected $client = null;
+class InstallTest extends GuzzleHarness {
 
     public function setUp()
     {
-        $this->client = new Client([
-            'base_uri'        => 'http://127.0.0.1:8081',
-            'timeout'         => 1,
-        ]);
-
-        $this->removeCustomFiles();
+        parent::setUp();
+        removeCustomFiles();
     }
 
     public function tearDown()
     {
-        $this->removeCustomFiles();
-    }
-
-    protected function removeCustomFiles()
-    {
-        $toRemove = [
-            custom_path('config.yml'),
-            custom_path('people.opml'),
-            custom_path('people.opml.bak'),
-            custom_path('cache')
-        ];
-
-        foreach ($toRemove as $path) {
-            if (file_exists($path)) {
-                unlink($path);
-            }
-        }
+        parent::tearDown();
+        removeCustomFiles();
     }
 
     public function test_index_page_tells_moonmoon_is_not_installed()