From c976ebb934d900d284efa9db632412f157058374 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Thu, 20 Aug 2020 23:23:56 -0700
Subject: [PATCH] chore: update 'acorn-eventual-send' package to use AVA for
 testing

---
 packages/acorn-eventual-send/package.json     | 16 ++++++----
 .../acorn-eventual-send/test/test-parser.js   | 23 +++++++++++++++
 .../acorn-eventual-send/test/test-rollup.js   | 22 +++++---------
 packages/acorn-eventual-send/test/test.js     | 29 -------------------
 4 files changed, 42 insertions(+), 48 deletions(-)
 create mode 100644 packages/acorn-eventual-send/test/test-parser.js
 delete mode 100644 packages/acorn-eventual-send/test/test.js

diff --git a/packages/acorn-eventual-send/package.json b/packages/acorn-eventual-send/package.json
index be3eeebbabae..7b1ff43704c6 100644
--- a/packages/acorn-eventual-send/package.json
+++ b/packages/acorn-eventual-send/package.json
@@ -5,17 +5,15 @@
   "main": "index.js",
   "scripts": {
     "build": "exit 0",
-    "test": "tape -r esm 'test/**/*.js'",
+    "test": "ava",
     "lint-fix": "eslint --fix '**/*.js'",
     "lint-check": "eslint '**/*.js'"
   },
   "devDependencies": {
     "acorn": "^7.1.0",
+    "ava": "^3.11.1",
     "esm": "^3.2.25",
-    "rollup": "^1.16.7",
-    "tap-spec": "^5.0.0",
-    "tape": "^4.9.2",
-    "tape-promise": "^4.0.0"
+    "rollup": "^1.16.7"
   },
   "keywords": [],
   "files": [
@@ -33,5 +31,13 @@
   "homepage": "https://github.com/acorn-eventual-send#readme",
   "publishConfig": {
     "access": "public"
+  },
+  "ava": {
+    "files": [
+      "test/**/test-*.js"
+    ],
+    "require": [
+      "esm"
+    ]
   }
 }
diff --git a/packages/acorn-eventual-send/test/test-parser.js b/packages/acorn-eventual-send/test/test-parser.js
new file mode 100644
index 000000000000..c067d0b036a1
--- /dev/null
+++ b/packages/acorn-eventual-send/test/test-parser.js
@@ -0,0 +1,23 @@
+import test from 'ava';
+import * as acorn from 'acorn';
+import eventualSend from '..';
+
+test('parser', async t => {
+  const MyParser = acorn.Parser.extend(eventualSend(acorn));
+  const parser = src => MyParser.parse(src);
+
+  // FIXME: Compare parse trees.
+  t.truthy(parser('x ~. p(y, z, q)'), 'post');
+  t.truthy(parser('x ~. [i](y, z)'), 'computed post');
+  t.truthy(parser('x ~. (y, z)'), 'apply');
+  t.truthy(parser('x ~. ()'), 'apply nothing');
+  t.truthy(parser('x ~. p'), 'get');
+  t.truthy(parser('x ~. [i]'), 'computed get');
+  t.truthy(parser('x ~. p = v'), 'put');
+  t.truthy(parser('x ~. [i] = v'), 'computed put');
+  t.truthy(parser('delete x ~. p'), 'delete');
+  t.truthy(parser('delete x ~.[p]'), 'computed delete');
+  t.truthy(parser('x~.\n  p'), 'no asi');
+  t.truthy(parser('x\n  /* foo */ ~.p'), 'no asi2');
+  t.truthy(parser('x~.p~.()'), 'chained get/post');
+});
diff --git a/packages/acorn-eventual-send/test/test-rollup.js b/packages/acorn-eventual-send/test/test-rollup.js
index 54d36d6e70f4..27d279435561 100644
--- a/packages/acorn-eventual-send/test/test-rollup.js
+++ b/packages/acorn-eventual-send/test/test-rollup.js
@@ -1,20 +1,14 @@
-import { test } from 'tape-promise/tape';
+import test from 'ava';
 import { rollup } from 'rollup/dist/rollup.es';
 import * as acorn from 'acorn';
 import eventualSend from '..';
 
 test('SwingSet bug', async t => {
-  try {
-    const bundle = await rollup({
-      input: require.resolve('../encouragementBotCommsWavyDot/bootstrap.js'),
-      treeshake: false,
-      external: [],
-      acornInjectPlugins: [eventualSend(acorn)],
-    });
-    t.ok(bundle);
-  } catch (e) {
-    t.isNot(e, e, 'unexpected exception');
-  } finally {
-    t.end();
-  }
+  const bundle = await rollup({
+    input: require.resolve('../encouragementBotCommsWavyDot/bootstrap.js'),
+    treeshake: false,
+    external: [],
+    acornInjectPlugins: [eventualSend(acorn)],
+  });
+  t.truthy(bundle);
 });
diff --git a/packages/acorn-eventual-send/test/test.js b/packages/acorn-eventual-send/test/test.js
deleted file mode 100644
index bba5661a4fd2..000000000000
--- a/packages/acorn-eventual-send/test/test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { test } from 'tape-promise/tape';
-import * as acorn from 'acorn';
-import eventualSend from '..';
-
-test('parser', async t => {
-  try {
-    const MyParser = acorn.Parser.extend(eventualSend(acorn));
-    const parser = src => MyParser.parse(src);
-
-    // FIXME: Compare parse trees.
-    t.ok(parser('x ~. p(y, z, q)'), 'post');
-    t.ok(parser('x ~. [i](y, z)'), 'computed post');
-    t.ok(parser('x ~. (y, z)'), 'apply');
-    t.ok(parser('x ~. ()'), 'apply nothing');
-    t.ok(parser('x ~. p'), 'get');
-    t.ok(parser('x ~. [i]'), 'computed get');
-    t.ok(parser('x ~. p = v'), 'put');
-    t.ok(parser('x ~. [i] = v'), 'computed put');
-    t.ok(parser('delete x ~. p'), 'delete');
-    t.ok(parser('delete x ~.[p]'), 'computed delete');
-    t.ok(parser('x~.\n  p'), 'no asi');
-    t.ok(parser('x\n  /* foo */ ~.p'), 'no asi2');
-    t.ok(parser('x~.p~.()'), 'chained get/post');
-  } catch (e) {
-    t.isNot(e, e, 'unexpected exception');
-  } finally {
-    t.end();
-  }
-});