From c8b5c8a9e092658d756bea32a716dc59abda1ded Mon Sep 17 00:00:00 2001
From: Christopher Pitt <cgpitt@gmail.com>
Date: Fri, 27 Oct 2017 19:12:27 -0400
Subject: [PATCH] Refactor for new plugin

---
 composer.json              | 21 ++++++++--------
 phpunit.xml                |  2 +-
 {src => source}/macros.yay |  0
 tests/MacroTest.php        | 44 +++++++++++++++++++++++++++++++++
 tests/SpecTest.php         | 13 ----------
 tests/bootstrap.php        |  7 ------
 tests/specs/async.spec     | 50 ++++++++++++++++++++------------------
 7 files changed, 82 insertions(+), 55 deletions(-)
 rename {src => source}/macros.yay (100%)
 create mode 100644 tests/MacroTest.php
 delete mode 100644 tests/SpecTest.php
 delete mode 100644 tests/bootstrap.php

diff --git a/composer.json b/composer.json
index 8fcd8ef..d3b4088 100644
--- a/composer.json
+++ b/composer.json
@@ -2,20 +2,21 @@
     "type": "pre-macro",
     "name": "pre/async",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../pre-plugin"
+        }
+    ],
     "require": {
-        "pre/plugin": "^0.7.3"
+        "pre/plugin": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Pre\\Async\\": "tests"
-        }
-    },
     "extra": {
-        "macros": [
-            "src/macros.yay"
-        ]
-    }
+        "macros": ["source/macros.yay"]
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/phpunit.xml b/phpunit.xml
index bd5ed4c..eb6713c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
diff --git a/src/macros.yay b/source/macros.yay
similarity index 100%
rename from src/macros.yay
rename to source/macros.yay
diff --git a/tests/MacroTest.php b/tests/MacroTest.php
new file mode 100644
index 0000000..490bfec
--- /dev/null
+++ b/tests/MacroTest.php
@@ -0,0 +1,44 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+putenv("PRE_BASE_DIR=" . realpath(__DIR__ . "/../"));
+
+class MacroTest extends TestCase
+{
+    /**
+     * @test
+     * @dataProvider specs
+     */
+    public function can_transform_code($from, $expected)
+    {
+        Pre\Plugin\addMacro(__DIR__ . "/../source/macros.yay");
+
+        $actual = Pre\plugin\format(Pre\Plugin\parse($this->format($from)));
+        $this->assertEquals($this->format($expected), $actual);
+    }
+
+    private function format($code)
+    {
+        return "<?php\n\n" . trim($code) . "\n";
+    }
+
+    public static function specs()
+    {
+        $specs = [];
+
+        $files = [
+            __DIR__ . "/specs/async.spec",
+        ];
+
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+            
+            foreach (explode("---", $contents) as $spec) {
+                array_push($specs, explode("~~~", $spec));
+            }
+        }
+
+        return $specs;
+    }
+}
diff --git a/tests/SpecTest.php b/tests/SpecTest.php
deleted file mode 100644
index db6cd6d..0000000
--- a/tests/SpecTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Pre\Async;
-
-use Pre\Plugin\Testing\Runner;
-
-class SpecTest extends Runner
-{
-    protected function path(): string
-    {
-        return __DIR__ . "/specs";
-    }
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index cd4b3ad..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-require __DIR__ . "/../vendor/autoload.php";
-
-putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
-
-Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
diff --git a/tests/specs/async.spec b/tests/specs/async.spec
index 4a4bb6e..75e0a2c 100644
--- a/tests/specs/async.spec
+++ b/tests/specs/async.spec
@@ -1,14 +1,17 @@
---DESCRIPTION--
-
-Test async macros
+interface AsyncInterface
+{
+    async public function run();
+}
 
---GIVEN--
+~~~
 
 interface AsyncInterface
 {
-    async public function run();
+    public function run(): \Amp\Promise;
 }
 
+---
+
 class AsyncClass
 {
     async public function first(array $data = [])
@@ -27,25 +30,7 @@ class AsyncClass
     }
 }
 
-$first = async function() {
-    yield "here";
-};
-
-$second = async function() {
-    $this->something();
-    yield $thing;
-};
-
-$third = async () => {
-    yield $thing;
-};
-
---EXPECT--
-
-interface AsyncInterface
-{
-    public function run(): \Amp\Promise;
-}
+~~~
 
 class AsyncClass
 {
@@ -72,6 +57,23 @@ class AsyncClass
     }
 }
 
+---
+
+$first = async function() {
+    yield "here";
+};
+
+$second = async function() {
+    $this->something();
+    yield $thing;
+};
+
+$third = async () => {
+    yield $thing;
+};
+
+~~~
+
 $first = function (): \Amp\Promise {
     return \Amp\call(function () {
         yield "here";