Skip to content

Commit e1c9bc7

Browse files
committed
Switch to tap
1 parent 91cf703 commit e1c9bc7

File tree

6 files changed

+1726
-190
lines changed

6 files changed

+1726
-190
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
dist/
55
node_modules
66
npm-debug.log
7+
.nyc_output

package.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/observablehq/stdlib.git"
1414
},
1515
"scripts": {
16-
"test": "tape -r esm 'test/**/*-test.js'",
16+
"test": "tap 'test/**/*-test.js'",
1717
"prepublishOnly": "rollup -c",
1818
"postpublish": "git push && git push --tags"
1919
},
@@ -22,17 +22,12 @@
2222
"pre-commit": "eslint . && yarn test"
2323
}
2424
},
25-
"esm": {
26-
"mode": "all",
27-
"cjs": true
28-
},
2925
"files": [
3026
"src/**/*.js",
3127
"dist/**/*.js"
3228
],
3329
"dependencies": {
3430
"d3-require": "^1.2.0",
35-
"esm": "^3.0.84",
3631
"marked": "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"
3732
},
3833
"devDependencies": {
@@ -42,7 +37,6 @@
4237
"rollup": "^1.20.3",
4338
"rollup-plugin-node-resolve": "^5.0.0",
4439
"rollup-plugin-terser": "^5.0.0",
45-
"tape": "^4.9.0",
46-
"tape-await": "0.1.2"
40+
"tap": "^14.6.7"
4741
}
4842
}

test/generators/disposable-test.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
import tape from "tape-await";
1+
import { test } from "tap";
22
import disposable from "../../src/generators/disposable";
33

4-
tape("disposable(value, dispose) yields the specified value", async test => {
4+
test("disposable(value, dispose) yields the specified value", async t => {
55
const foo = {};
66
const generator = disposable(foo, () => {});
7-
test.deepEqual(generator.next(), {done: false, value: foo});
8-
test.deepEqual(generator.next(), {done: true});
7+
t.deepEqual(generator.next(), { done: false, value: foo });
8+
t.deepEqual(generator.next(), { done: true });
9+
t.end();
910
});
1011

11-
tape("disposable(value, dispose) defines generator.return", async test => {
12+
test("disposable(value, dispose) defines generator.return", async t => {
1213
let passedFoo;
1314
const foo = {};
14-
const generator = disposable(foo, _ => passedFoo = _);
15-
test.deepEqual(generator.return(), {done: true});
16-
test.equal(passedFoo, foo);
17-
test.deepEqual(generator.next(), {done: true});
15+
const generator = disposable(foo, _ => (passedFoo = _));
16+
t.deepEqual(generator.return(), { done: true });
17+
t.equal(passedFoo, foo);
18+
t.deepEqual(generator.next(), { done: true });
19+
t.end();
1820
});
1921

20-
tape("disposable(value, dispose) defines generator.throw", async test => {
22+
test("disposable(value, dispose) defines generator.throw", async t => {
2123
const generator = disposable(42, () => {});
22-
test.deepEqual(generator.throw(new Error), {done: true});
23-
test.deepEqual(generator.next(), {done: true});
24+
t.deepEqual(generator.throw(new Error()), { done: true });
25+
t.deepEqual(generator.next(), { done: true });
26+
t.end();
2427
});

test/index-test.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import tape from "tape-await";
1+
import { test } from "tap";
22
import Library from "../src/library";
33

4-
tape("new Library returns a library with the expected keys", async test => {
5-
test.deepEqual(Object.keys(new Library()).sort(), [
4+
test("new Library returns a library with the expected keys", async t => {
5+
t.deepEqual(Object.keys(new Library()).sort(), [
66
"DOM",
77
"Files",
88
"Generators",
@@ -17,4 +17,5 @@ tape("new Library returns a library with the expected keys", async test => {
1717
"tex",
1818
"width"
1919
]);
20+
t.end();
2021
});

test/promises/delay-test.js

+22-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
1-
import tape from "tape-await";
1+
import { test } from "tap";
22
import delay from "../../src/promises/delay";
3+
import tick from "../../src/promises/tick";
34

4-
tape("delay(duration) resolves with undefined", async test => {
5-
test.equal(await delay(50), undefined);
5+
test("delay(duration) resolves with undefined", async t => {
6+
t.equal(await delay(50), undefined);
7+
t.end();
68
});
79

8-
tape("delay(duration) resolves after the specified duration", async test => {
10+
test("delay(duration) resolves after the specified duration", async t => {
911
const then = Date.now();
1012
await delay(150);
1113
const delta = Date.now() - then;
12-
test.ok(130 <= delta && delta <= 170);
14+
t.ok(130 <= delta && delta <= 170);
15+
t.end();
1316
});
1417

15-
tape("delay(duration, value) resolves with the specified value", async test => {
16-
test.equal(await delay(50, "foo"), "foo");
18+
test("delay(duration, value) resolves with the specified value", async t => {
19+
t.equal(await delay(50, "foo"), "foo");
20+
t.end();
1721
});
1822

19-
tape("delay(duration, value) resolves with the specified value after the specified duration", async test => {
23+
test("delay(duration, value) resolves with the specified value after the specified duration", async t => {
2024
const then = Date.now();
21-
test.equal(await delay(150, "foo"), "foo");
25+
t.equal(await delay(150, "foo"), "foo");
2226
const delta = Date.now() - then;
23-
test.ok(130 <= delta && delta <= 170);
27+
t.ok(130 <= delta && delta <= 170);
28+
t.end();
29+
});
30+
31+
test("tick(1000) resolves near the second boundary", async t => {
32+
await tick(1000);
33+
const now = Date.now();
34+
t.ok(now % 1000 < 10, `${now % 1000} deviation from the second`);
35+
t.end();
2436
});

0 commit comments

Comments
 (0)