@plugjs/expect5 0.4.27 → 0.4.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.mjs +2 -2
- package/dist/cli.mjs.map +1 -1
- package/dist/expectation/include.cjs +7 -6
- package/dist/expectation/include.cjs.map +1 -1
- package/dist/expectation/include.mjs +7 -6
- package/dist/expectation/include.mjs.map +1 -1
- package/dist/test.cjs +5 -5
- package/dist/test.cjs.map +1 -1
- package/dist/test.d.ts +1 -1
- package/dist/test.mjs +5 -5
- package/dist/test.mjs.map +1 -1
- package/package.json +3 -3
- package/src/cli.mts +1 -1
- package/src/expectation/include.ts +8 -6
- package/src/test.ts +7 -7
package/dist/cli.mjs
CHANGED
|
@@ -8,7 +8,7 @@ var { $blu, $und, $gry, $wht } = logging;
|
|
|
8
8
|
var $gnd = (s) => $gry($und(s));
|
|
9
9
|
var $bnd = (s) => $blu($und(s));
|
|
10
10
|
var $wnd = (s) => $wht($und(s));
|
|
11
|
-
var version = true ? "0.4.
|
|
11
|
+
var version = true ? "0.4.29" : "0.0.0-dev";
|
|
12
12
|
function help() {
|
|
13
13
|
console.log(`${$blu($und("Usage:"))}
|
|
14
14
|
|
|
@@ -85,7 +85,7 @@ main(import.meta.url, async (args) => {
|
|
|
85
85
|
const glob = globs.shift() || "test/**/*.test.([cm])?[jt]s";
|
|
86
86
|
try {
|
|
87
87
|
process.exitCode = 0;
|
|
88
|
-
await async.runAsync(context,
|
|
88
|
+
await async.runAsync(context, () => {
|
|
89
89
|
return find(glob, ...globs, { directory }).plug(new Test());
|
|
90
90
|
});
|
|
91
91
|
} catch (error) {
|
package/dist/cli.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/cli.mts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -24,6 +24,7 @@ __export(include_exports, {
|
|
|
24
24
|
toMatchContents: () => toMatchContents
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(include_exports);
|
|
27
|
+
var import_logging = require("@plugjs/plug/logging");
|
|
27
28
|
var import_diff = require("./diff.cjs");
|
|
28
29
|
var import_types = require("./types.cjs");
|
|
29
30
|
function toInclude(expectations, negative, contents) {
|
|
@@ -87,9 +88,9 @@ function includesProps(expectations, negative, expected) {
|
|
|
87
88
|
const count = Object.keys(props).length;
|
|
88
89
|
if (count === 0)
|
|
89
90
|
return;
|
|
90
|
-
const type = count
|
|
91
|
+
const type = (0, import_logging.$plur)(count, "property", "properties", false);
|
|
91
92
|
const not = negative ? "not " : "";
|
|
92
|
-
throw new import_types.ExpectationError(expectations, `${not}to include ${
|
|
93
|
+
throw new import_types.ExpectationError(expectations, `${not}to include ${type}`, {
|
|
93
94
|
diff: true,
|
|
94
95
|
value: actual,
|
|
95
96
|
props
|
|
@@ -130,9 +131,9 @@ function includesValues(expectations, negative, expected) {
|
|
|
130
131
|
const count = values.length;
|
|
131
132
|
if (count === 0)
|
|
132
133
|
return;
|
|
133
|
-
const type = count
|
|
134
|
+
const type = (0, import_logging.$plur)(count, "value", "values", false);
|
|
134
135
|
const not = negative ? "not " : "";
|
|
135
|
-
throw new import_types.ExpectationError(expectations, `${not}to include ${
|
|
136
|
+
throw new import_types.ExpectationError(expectations, `${not}to include ${type}`, {
|
|
136
137
|
diff: true,
|
|
137
138
|
value: expectations.value,
|
|
138
139
|
values
|
|
@@ -162,9 +163,9 @@ function includesMappings(expectations, negative, expected) {
|
|
|
162
163
|
const count = mappings.length;
|
|
163
164
|
if (count === 0)
|
|
164
165
|
return;
|
|
165
|
-
const type = count
|
|
166
|
+
const type = (0, import_logging.$plur)(count, "mapping", "mappings", false);
|
|
166
167
|
const not = negative ? "not " : "";
|
|
167
|
-
throw new import_types.ExpectationError(expectations, `${not}to include ${
|
|
168
|
+
throw new import_types.ExpectationError(expectations, `${not}to include ${type}`, {
|
|
168
169
|
diff: true,
|
|
169
170
|
value: expectations.value,
|
|
170
171
|
mappings
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/expectation/include.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AACrB,mBAIO;AAOA,SAAS,UACZ,cACA,UACA,UAKI;AAEN,MAAI,oBAAoB;AAAK,WAAO,iBAAiB,cAAc,UAAU,QAAQ;AACrF,MAAI,oBAAoB;AAAK,WAAO,eAAe,cAAc,UAAU,QAAQ;AACnF,MAAI,MAAM,QAAQ,QAAQ;AAAG,WAAO,eAAe,cAAc,UAAU,IAAI,IAAI,QAAQ,CAAC;AAC5F,MAAI,oBAAoB;AAAQ,WAAO,cAAc,cAAc,UAAU,QAAQ;AACrF,QAAM,IAAI,UAAU,0CAAsC,6BAAe,QAAQ,CAAC,EAAE;AACtF;AAIO,SAAS,gBACZ,cACA,UACI;AACN,MAAI;AACJ,MAAI;AACJ,MAAI;AACF,aAAS,IAAI,IAAI,aAAa,KAAY;AAC1C,eAAW,IAAI,IAAI,QAAQ;AAAA,EAC7B,SAAS,OAAO;AACd,UAAM,IAAI,8BAAiB,cAAc,0BAA0B;AAAA,EACrE;AAEA,QAAM,aAAS,kBAAK,QAAQ,QAAQ;AACpC,SAAO,OAAO;AACd,MAAI,CAAE,OAAO;AAAM;AAEnB,QAAM,IAAI;AAAA,IAAiB;AAAA,IACvB,4BAAwB,kCAAoB,QAAQ,CAAC;AAAA,IACrD,EAAE,GAAG,QAAQ,OAAO,aAAa,MAAM;AAAA,EAAC;AAC9C;AAMA,SAAS,cACL,cACA,UACA,UACI;AAEN,MAAI,aAAa,iBAAiB,KAAK;AACrC,WAAO,iBAAiB,cAAc,UAAU,IAAI,IAAI,OAAO,QAAQ,QAAQ,CAAC,CAAC;AAAA,EACnF;AAGA,eAAa,eAAe,MAAM;AAClC,QAAM,SAA8B,aAAa;AAGjD,QAAM,OAAO,IAAI,IAAI,OAAO,KAAK,QAAQ,CAAC;AAC1C,QAAM,QAA8B,CAAC;AAErC,MAAI,UAAU;AAEZ,eAAW,OAAO,MAAM;AACtB,UAAK,OAAO,GAAG,MAAM,UAAe,OAAO,QAAS;AAClD,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,OAAO,OAAO,GAAG,EAAE;AAAA,MAChD;AAAA,IACF;AAAA,EACF,OAAO;AACL,eAAW,OAAO,MAAM;AACtB,YAAM,MAAM,OAAO,GAAG;AACtB,YAAM,MAAM,SAAS,GAAG;AAExB,YAAM,aAAS,kBAAK,KAAK,GAAG;AAC5B,UAAI,CAAE,OAAO;AAAM;AAGnB,UAAK,QAAQ,UAAe,EAAG,OAAO,SAAU;AAC9C,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,SAAS,IAAI;AAAA,MAC1C,OAAO;AACL,cAAM,GAAG,IAAI;AAAA,MACf;AAAA,IACF;AAAA,EACF;AAEA,QAAM,QAAQ,OAAO,KAAK,KAAK,EAAE;AACjC,MAAI,UAAU;AAAG;AAEjB,QAAM,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// expectation/include.ts
|
|
2
|
+
import { $plur } from "@plugjs/plug/logging";
|
|
2
3
|
import { diff } from "./diff.mjs";
|
|
3
4
|
import {
|
|
4
5
|
ExpectationError,
|
|
@@ -66,9 +67,9 @@ function includesProps(expectations, negative, expected) {
|
|
|
66
67
|
const count = Object.keys(props).length;
|
|
67
68
|
if (count === 0)
|
|
68
69
|
return;
|
|
69
|
-
const type = count
|
|
70
|
+
const type = $plur(count, "property", "properties", false);
|
|
70
71
|
const not = negative ? "not " : "";
|
|
71
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
72
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
72
73
|
diff: true,
|
|
73
74
|
value: actual,
|
|
74
75
|
props
|
|
@@ -109,9 +110,9 @@ function includesValues(expectations, negative, expected) {
|
|
|
109
110
|
const count = values.length;
|
|
110
111
|
if (count === 0)
|
|
111
112
|
return;
|
|
112
|
-
const type = count
|
|
113
|
+
const type = $plur(count, "value", "values", false);
|
|
113
114
|
const not = negative ? "not " : "";
|
|
114
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
115
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
115
116
|
diff: true,
|
|
116
117
|
value: expectations.value,
|
|
117
118
|
values
|
|
@@ -141,9 +142,9 @@ function includesMappings(expectations, negative, expected) {
|
|
|
141
142
|
const count = mappings.length;
|
|
142
143
|
if (count === 0)
|
|
143
144
|
return;
|
|
144
|
-
const type = count
|
|
145
|
+
const type = $plur(count, "mapping", "mappings", false);
|
|
145
146
|
const not = negative ? "not " : "";
|
|
146
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
147
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
147
148
|
diff: true,
|
|
148
149
|
value: expectations.value,
|
|
149
150
|
mappings
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/expectation/include.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,YAAY;AACrB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAOA,SAAS,UACZ,cACA,UACA,UAKI;AAEN,MAAI,oBAAoB;AAAK,WAAO,iBAAiB,cAAc,UAAU,QAAQ;AACrF,MAAI,oBAAoB;AAAK,WAAO,eAAe,cAAc,UAAU,QAAQ;AACnF,MAAI,MAAM,QAAQ,QAAQ;AAAG,WAAO,eAAe,cAAc,UAAU,IAAI,IAAI,QAAQ,CAAC;AAC5F,MAAI,oBAAoB;AAAQ,WAAO,cAAc,cAAc,UAAU,QAAQ;AACrF,QAAM,IAAI,UAAU,sCAAsC,eAAe,QAAQ,CAAC,EAAE;AACtF;AAIO,SAAS,gBACZ,cACA,UACI;AACN,MAAI;AACJ,MAAI;AACJ,MAAI;AACF,aAAS,IAAI,IAAI,aAAa,KAAY;AAC1C,eAAW,IAAI,IAAI,QAAQ;AAAA,EAC7B,SAAS,OAAO;AACd,UAAM,IAAI,iBAAiB,cAAc,0BAA0B;AAAA,EACrE;AAEA,QAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,SAAO,OAAO;AACd,MAAI,CAAE,OAAO;AAAM;AAEnB,QAAM,IAAI;AAAA,IAAiB;AAAA,IACvB,wBAAwB,oBAAoB,QAAQ,CAAC;AAAA,IACrD,EAAE,GAAG,QAAQ,OAAO,aAAa,MAAM;AAAA,EAAC;AAC9C;AAMA,SAAS,cACL,cACA,UACA,UACI;AAEN,MAAI,aAAa,iBAAiB,KAAK;AACrC,WAAO,iBAAiB,cAAc,UAAU,IAAI,IAAI,OAAO,QAAQ,QAAQ,CAAC,CAAC;AAAA,EACnF;AAGA,eAAa,eAAe,MAAM;AAClC,QAAM,SAA8B,aAAa;AAGjD,QAAM,OAAO,IAAI,IAAI,OAAO,KAAK,QAAQ,CAAC;AAC1C,QAAM,QAA8B,CAAC;AAErC,MAAI,UAAU;AAEZ,eAAW,OAAO,MAAM;AACtB,UAAK,OAAO,GAAG,MAAM,UAAe,OAAO,QAAS;AAClD,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,OAAO,OAAO,GAAG,EAAE;AAAA,MAChD;AAAA,IACF;AAAA,EACF,OAAO;AACL,eAAW,OAAO,MAAM;AACtB,YAAM,MAAM,OAAO,GAAG;AACtB,YAAM,MAAM,SAAS,GAAG;AAExB,YAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,UAAI,CAAE,OAAO;AAAM;AAGnB,UAAK,QAAQ,UAAe,EAAG,OAAO,SAAU;AAC9C,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,SAAS,IAAI;AAAA,MAC1C,OAAO;AACL,cAAM,GAAG,IAAI;AAAA,MACf;AAAA,IACF;AAAA,EACF;AAEA,QAAM,QAAQ,OAAO,KAAK,KAAK,EAAE;AACjC,MAAI,UAAU;AAAG;AAEjB,QAAM,OAAO,
|
|
4
|
+
"mappings": ";AAAA,SAAS,aAAa;AAEtB,SAAS,YAAY;AACrB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAOA,SAAS,UACZ,cACA,UACA,UAKI;AAEN,MAAI,oBAAoB;AAAK,WAAO,iBAAiB,cAAc,UAAU,QAAQ;AACrF,MAAI,oBAAoB;AAAK,WAAO,eAAe,cAAc,UAAU,QAAQ;AACnF,MAAI,MAAM,QAAQ,QAAQ;AAAG,WAAO,eAAe,cAAc,UAAU,IAAI,IAAI,QAAQ,CAAC;AAC5F,MAAI,oBAAoB;AAAQ,WAAO,cAAc,cAAc,UAAU,QAAQ;AACrF,QAAM,IAAI,UAAU,sCAAsC,eAAe,QAAQ,CAAC,EAAE;AACtF;AAIO,SAAS,gBACZ,cACA,UACI;AACN,MAAI;AACJ,MAAI;AACJ,MAAI;AACF,aAAS,IAAI,IAAI,aAAa,KAAY;AAC1C,eAAW,IAAI,IAAI,QAAQ;AAAA,EAC7B,SAAS,OAAO;AACd,UAAM,IAAI,iBAAiB,cAAc,0BAA0B;AAAA,EACrE;AAEA,QAAM,SAAS,KAAK,QAAQ,QAAQ;AACpC,SAAO,OAAO;AACd,MAAI,CAAE,OAAO;AAAM;AAEnB,QAAM,IAAI;AAAA,IAAiB;AAAA,IACvB,wBAAwB,oBAAoB,QAAQ,CAAC;AAAA,IACrD,EAAE,GAAG,QAAQ,OAAO,aAAa,MAAM;AAAA,EAAC;AAC9C;AAMA,SAAS,cACL,cACA,UACA,UACI;AAEN,MAAI,aAAa,iBAAiB,KAAK;AACrC,WAAO,iBAAiB,cAAc,UAAU,IAAI,IAAI,OAAO,QAAQ,QAAQ,CAAC,CAAC;AAAA,EACnF;AAGA,eAAa,eAAe,MAAM;AAClC,QAAM,SAA8B,aAAa;AAGjD,QAAM,OAAO,IAAI,IAAI,OAAO,KAAK,QAAQ,CAAC;AAC1C,QAAM,QAA8B,CAAC;AAErC,MAAI,UAAU;AAEZ,eAAW,OAAO,MAAM;AACtB,UAAK,OAAO,GAAG,MAAM,UAAe,OAAO,QAAS;AAClD,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,OAAO,OAAO,GAAG,EAAE;AAAA,MAChD;AAAA,IACF;AAAA,EACF,OAAO;AACL,eAAW,OAAO,MAAM;AACtB,YAAM,MAAM,OAAO,GAAG;AACtB,YAAM,MAAM,SAAS,GAAG;AAExB,YAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,UAAI,CAAE,OAAO;AAAM;AAGnB,UAAK,QAAQ,UAAe,EAAG,OAAO,SAAU;AAC9C,cAAM,GAAG,IAAI,EAAE,MAAM,MAAM,SAAS,IAAI;AAAA,MAC1C,OAAO;AACL,cAAM,GAAG,IAAI;AAAA,MACf;AAAA,IACF;AAAA,EACF;AAEA,QAAM,QAAQ,OAAO,KAAK,KAAK,EAAE;AACjC,MAAI,UAAU;AAAG;AAEjB,QAAM,OAAO,MAAM,OAAO,YAAY,cAAc,KAAK;AACzD,QAAM,MAAM,WAAW,SAAS;AAChC,QAAM,IAAI,iBAAiB,cAAc,GAAG,GAAG,cAAc,IAAI,IAAI;AAAA,IACnE,MAAM;AAAA,IACN,OAAO;AAAA,IACP;AAAA,EACF,CAAC;AACH;AAEA,SAAS,eACL,cACA,UACA,UACI;AAEN,eAAa,eAAe,MAAM;AAClC,MAAI,OAAQ,aAAa,MAAc,OAAO,QAAQ,MAAM,YAAY;AACtE,UAAM,IAAI,iBAAiB,cAAc,0BAA0B;AAAA,EACrE;AACA,QAAM,SAAS,IAAI,IAAI,aAAa,KAAsB;AAG1D,QAAM,SAAiB,CAAC;AACxB,MAAI,UAAU;AACZ,eAAW,OAAO,UAAU;AAC1B,iBAAW,OAAO,QAAQ;AACxB,cAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,YAAI,OAAO;AAAM;AAEjB,eAAO,KAAK,EAAE,MAAM,MAAM,OAAO,IAAI,CAAC;AACtC;AAAA,MACF;AAAA,IACF;AAAA,EACF,OAAO;AACL,eAAW,OAAO,UAAU;AAC1B,UAAI,QAAQ;AAEZ,iBAAW,OAAO,QAAQ;AACxB,cAAM,SAAS,KAAK,KAAK,GAAG;AAC5B,YAAI,OAAO;AAAM;AACjB,gBAAQ;AACR;AAAA,MACF;AAEA,UAAI,CAAE,OAAO;AACX,eAAO,KAAK,EAAE,MAAM,MAAM,SAAS,IAAI,CAAC;AAAA,MAC1C;AAAA,IACF;AAAA,EACF;AAEA,QAAM,QAAQ,OAAO;AACrB,MAAI,UAAU;AAAG;AAEjB,QAAM,OAAO,MAAM,OAAO,SAAS,UAAU,KAAK;AAClD,QAAM,MAAM,WAAW,SAAS;AAChC,QAAM,IAAI,iBAAiB,cAAc,GAAG,GAAG,cAAc,IAAI,IAAI;AAAA,IACnE,MAAM;AAAA,IACN,OAAO,aAAa;AAAA,IACpB;AAAA,EACF,CAAC;AACH;AAEA,SAAS,iBACL,cACA,UACA,UACI;AACN,QAAM,SAAS,aAAa,eAAe,GAAG,EAAE;AAGhD,QAAM,OAAO,IAAI,IAAI,SAAS,KAAK,CAAC;AACpC,QAAM,WAA+B,CAAC;AAEtC,MAAI,UAAU;AAEZ,eAAW,OAAO,MAAM;AACtB,UAAI,OAAO,IAAI,GAAG,GAAG;AACnB,iBAAS,KAAK,CAAE,KAAK,EAAE,MAAM,MAAM,OAAO,OAAO,IAAI,GAAG,EAAE,CAAE,CAAC;AAAA,MAC/D;AAAA,IACF;AAAA,EACF,OAAO;AACL,eAAW,OAAO,MAAM;AACtB,UAAI,CAAE,OAAO,IAAI,GAAG,GAAG;AACrB,iBAAS,KAAK,CAAE,KAAK,EAAE,MAAM,MAAM,SAAS,SAAS,IAAI,GAAG,EAAE,CAAE,CAAC;AAAA,MACnE,OAAO;AACL,cAAM,SAAS,KAAK,OAAO,IAAI,GAAG,GAAG,SAAS,IAAI,GAAG,CAAC;AACtD,YAAI,OAAO;AAAM,mBAAS,KAAK,CAAE,KAAK,MAAO,CAAC;AAAA,MAChD;AAAA,IACF;AAAA,EACF;AAEA,QAAM,QAAQ,SAAS;AACvB,MAAI,UAAU;AAAG;AAEjB,QAAM,OAAO,MAAM,OAAO,WAAW,YAAY,KAAK;AACtD,QAAM,MAAM,WAAW,SAAS;AAChC,QAAM,IAAI,iBAAiB,cAAc,GAAG,GAAG,cAAc,IAAI,IAAI;AAAA,IACnE,MAAM;AAAA,IACN,OAAO,aAAa;AAAA,IACpB;AAAA,EACF,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/test.cjs
CHANGED
|
@@ -36,11 +36,11 @@ module.exports = __toCommonJS(test_exports);
|
|
|
36
36
|
var import_node_assert = require("node:assert");
|
|
37
37
|
var import_plug = require("@plugjs/plug");
|
|
38
38
|
var import_asserts = require("@plugjs/plug/asserts");
|
|
39
|
-
var import_paths = require("@plugjs/plug/paths");
|
|
40
39
|
var import_logging = require("@plugjs/plug/logging");
|
|
41
|
-
var
|
|
40
|
+
var import_paths = require("@plugjs/plug/paths");
|
|
42
41
|
var import_executable = require("./execution/executable.cjs");
|
|
43
42
|
var import_executor = require("./execution/executor.cjs");
|
|
43
|
+
var setup = __toESM(require("./execution/setup.cjs"), 1);
|
|
44
44
|
var import_diff = require("./expectation/diff.cjs");
|
|
45
45
|
var import_expect = require("./expectation/expect.cjs");
|
|
46
46
|
var import_print = require("./expectation/print.cjs");
|
|
@@ -92,8 +92,8 @@ var Test = class {
|
|
|
92
92
|
await suite.setup();
|
|
93
93
|
const snum = suite.specs;
|
|
94
94
|
const fnum = files.length;
|
|
95
|
-
const smsg = snum
|
|
96
|
-
const fmsg = fnum
|
|
95
|
+
const smsg = (0, import_logging.$plur)(snum, "spec", "specs");
|
|
96
|
+
const fmsg = (0, import_logging.$plur)(fnum, "file", "files");
|
|
97
97
|
(0, import_asserts.assert)(snum, "No specs configured by test files");
|
|
98
98
|
const execution = (0, import_executor.runSuite)(suite);
|
|
99
99
|
execution.on("suite:start", (current) => {
|
|
@@ -105,7 +105,7 @@ var Test = class {
|
|
|
105
105
|
} else if (current.parent) {
|
|
106
106
|
context.log.enter(import_logging.NOTICE, `${(0, import_logging.$blu)(_details)} ${(0, import_logging.$wht)(current.name)}`);
|
|
107
107
|
} else {
|
|
108
|
-
context.log.notice(`Running ${
|
|
108
|
+
context.log.notice(`Running ${smsg} from ${fmsg}`);
|
|
109
109
|
if (suite.flag === "only")
|
|
110
110
|
context.log.notice("");
|
|
111
111
|
}
|
package/dist/test.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/test.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,yBAA+B;AAE/B,kBAA6B;AAC7B,qBAAuB;AACvB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["log"]
|
|
6
6
|
}
|
package/dist/test.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference path="index.d.ts" />
|
|
2
|
-
import type { Context, PipeParameters, Plug } from '@plugjs/plug/pipe';
|
|
3
2
|
import type { Files } from '@plugjs/plug/files';
|
|
3
|
+
import type { Context, PipeParameters, Plug } from '@plugjs/plug/pipe';
|
|
4
4
|
/** Writes some info about the current {@link Files} being passed around. */
|
|
5
5
|
export declare class Test implements Plug<void> {
|
|
6
6
|
private readonly _options;
|
package/dist/test.mjs
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
import { AssertionError } from "node:assert";
|
|
3
3
|
import { BuildFailure } from "@plugjs/plug";
|
|
4
4
|
import { assert } from "@plugjs/plug/asserts";
|
|
5
|
+
import { $blu, $grn, $gry, $ms, $p, $plur, $red, $wht, $ylw, ERROR, NOTICE, WARN, githubAnnotation, log } from "@plugjs/plug/logging";
|
|
5
6
|
import { dirnameFromUrl, filenameFromUrl } from "@plugjs/plug/paths";
|
|
6
|
-
import { $blu, $grn, $gry, $ms, $red, $wht, $ylw, ERROR, NOTICE, WARN, log, $p, githubAnnotation } from "@plugjs/plug/logging";
|
|
7
|
-
import * as setup from "./execution/setup.mjs";
|
|
8
7
|
import { Suite, skip } from "./execution/executable.mjs";
|
|
9
8
|
import { runSuite } from "./execution/executor.mjs";
|
|
9
|
+
import * as setup from "./execution/setup.mjs";
|
|
10
10
|
import { diff } from "./expectation/diff.mjs";
|
|
11
11
|
import { expect } from "./expectation/expect.mjs";
|
|
12
12
|
import { printDiff } from "./expectation/print.mjs";
|
|
@@ -58,8 +58,8 @@ var Test = class {
|
|
|
58
58
|
await suite.setup();
|
|
59
59
|
const snum = suite.specs;
|
|
60
60
|
const fnum = files.length;
|
|
61
|
-
const smsg = snum
|
|
62
|
-
const fmsg = fnum
|
|
61
|
+
const smsg = $plur(snum, "spec", "specs");
|
|
62
|
+
const fmsg = $plur(fnum, "file", "files");
|
|
63
63
|
assert(snum, "No specs configured by test files");
|
|
64
64
|
const execution = runSuite(suite);
|
|
65
65
|
execution.on("suite:start", (current) => {
|
|
@@ -71,7 +71,7 @@ var Test = class {
|
|
|
71
71
|
} else if (current.parent) {
|
|
72
72
|
context.log.enter(NOTICE, `${$blu(_details)} ${$wht(current.name)}`);
|
|
73
73
|
} else {
|
|
74
|
-
context.log.notice(`Running ${
|
|
74
|
+
context.log.notice(`Running ${smsg} from ${fmsg}`);
|
|
75
75
|
if (suite.flag === "only")
|
|
76
76
|
context.log.notice("");
|
|
77
77
|
}
|
package/dist/test.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/test.ts"],
|
|
4
|
-
"mappings": ";AAGA,SAAS,sBAAsB;AAE/B,SAAS,oBAAoB;AAC7B,SAAS,cAAc;AACvB,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["log"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@plugjs/expect5",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.29",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.cjs",
|
|
6
6
|
"module": "./dist/index.mjs",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"license": "Apache-2.0",
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/chai": "^4.3.5",
|
|
47
|
-
"chai": "^4.3.
|
|
47
|
+
"chai": "^4.3.8"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@plugjs/plug": "0.4.
|
|
50
|
+
"@plugjs/plug": "0.4.29"
|
|
51
51
|
},
|
|
52
52
|
"files": [
|
|
53
53
|
"*.md",
|
package/src/cli.mts
CHANGED
|
@@ -112,7 +112,7 @@ main(import.meta.url, async (args): Promise<void> => {
|
|
|
112
112
|
// Simply create the Test plug and pass everything to it
|
|
113
113
|
try {
|
|
114
114
|
process.exitCode = 0
|
|
115
|
-
await async.runAsync(context,
|
|
115
|
+
await async.runAsync(context, () => {
|
|
116
116
|
return find(glob, ...globs, { directory }).plug(new Test())
|
|
117
117
|
})
|
|
118
118
|
} catch (error) {
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { $plur } from '@plugjs/plug/logging'
|
|
2
|
+
|
|
1
3
|
import { diff } from './diff'
|
|
2
4
|
import {
|
|
3
5
|
ExpectationError,
|
|
@@ -100,9 +102,9 @@ function includesProps(
|
|
|
100
102
|
const count = Object.keys(props).length
|
|
101
103
|
if (count === 0) return // no props? no errors!
|
|
102
104
|
|
|
103
|
-
const type = count
|
|
105
|
+
const type = $plur(count, 'property', 'properties', false)
|
|
104
106
|
const not = negative ? 'not ' : ''
|
|
105
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
107
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
106
108
|
diff: true,
|
|
107
109
|
value: actual,
|
|
108
110
|
props,
|
|
@@ -153,9 +155,9 @@ function includesValues(
|
|
|
153
155
|
const count = values.length
|
|
154
156
|
if (count === 0) return // no values? no errors!
|
|
155
157
|
|
|
156
|
-
const type = count
|
|
158
|
+
const type = $plur(count, 'value', 'values', false)
|
|
157
159
|
const not = negative ? 'not ' : ''
|
|
158
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
160
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
159
161
|
diff: true,
|
|
160
162
|
value: expectations.value,
|
|
161
163
|
values,
|
|
@@ -194,9 +196,9 @@ function includesMappings(
|
|
|
194
196
|
const count = mappings.length
|
|
195
197
|
if (count === 0) return // no mappings? no errors!
|
|
196
198
|
|
|
197
|
-
const type = count
|
|
199
|
+
const type = $plur(count, 'mapping', 'mappings', false)
|
|
198
200
|
const not = negative ? 'not ' : ''
|
|
199
|
-
throw new ExpectationError(expectations, `${not}to include ${
|
|
201
|
+
throw new ExpectationError(expectations, `${not}to include ${type}`, {
|
|
200
202
|
diff: true,
|
|
201
203
|
value: expectations.value,
|
|
202
204
|
mappings,
|
package/src/test.ts
CHANGED
|
@@ -5,21 +5,21 @@ import { AssertionError } from 'node:assert'
|
|
|
5
5
|
|
|
6
6
|
import { BuildFailure } from '@plugjs/plug'
|
|
7
7
|
import { assert } from '@plugjs/plug/asserts'
|
|
8
|
+
import { $blu, $grn, $gry, $ms, $p, $plur, $red, $wht, $ylw, ERROR, NOTICE, WARN, githubAnnotation, log } from '@plugjs/plug/logging'
|
|
8
9
|
import { dirnameFromUrl, filenameFromUrl } from '@plugjs/plug/paths'
|
|
9
|
-
import { $blu, $grn, $gry, $ms, $red, $wht, $ylw, ERROR, NOTICE, WARN, log, $p, githubAnnotation } from '@plugjs/plug/logging'
|
|
10
10
|
|
|
11
|
-
import * as setup from './execution/setup'
|
|
12
11
|
import { Suite, skip } from './execution/executable'
|
|
13
12
|
import { runSuite } from './execution/executor'
|
|
13
|
+
import * as setup from './execution/setup'
|
|
14
14
|
import { diff } from './expectation/diff'
|
|
15
15
|
import { expect } from './expectation/expect'
|
|
16
16
|
import { printDiff } from './expectation/print'
|
|
17
17
|
import { ExpectationError, stringifyValue } from './expectation/types'
|
|
18
18
|
|
|
19
|
-
import type { TestOptions } from './index'
|
|
20
|
-
import type { Context, PipeParameters, Plug } from '@plugjs/plug/pipe'
|
|
21
19
|
import type { Files } from '@plugjs/plug/files'
|
|
22
20
|
import type { Logger } from '@plugjs/plug/logging'
|
|
21
|
+
import type { Context, PipeParameters, Plug } from '@plugjs/plug/pipe'
|
|
22
|
+
import type { TestOptions } from './index'
|
|
23
23
|
|
|
24
24
|
const _pending = '\u22EF' // middle ellipsis
|
|
25
25
|
const _success = '\u2714' // heavy check mark
|
|
@@ -79,8 +79,8 @@ export class Test implements Plug<void> {
|
|
|
79
79
|
|
|
80
80
|
const snum = suite.specs
|
|
81
81
|
const fnum = files.length
|
|
82
|
-
const smsg = snum
|
|
83
|
-
const fmsg = fnum
|
|
82
|
+
const smsg = $plur(snum, 'spec', 'specs')
|
|
83
|
+
const fmsg = $plur(fnum, 'file', 'files')
|
|
84
84
|
|
|
85
85
|
assert(snum, 'No specs configured by test files')
|
|
86
86
|
|
|
@@ -95,7 +95,7 @@ export class Test implements Plug<void> {
|
|
|
95
95
|
} else if (current.parent) {
|
|
96
96
|
context.log.enter(NOTICE, `${$blu(_details)} ${$wht(current.name)}`)
|
|
97
97
|
} else {
|
|
98
|
-
context.log.notice(`Running ${
|
|
98
|
+
context.log.notice(`Running ${smsg} from ${fmsg}`)
|
|
99
99
|
if (suite.flag === 'only') context.log.notice('')
|
|
100
100
|
}
|
|
101
101
|
})
|