Skip to content

Commit d79cf91

Browse files
rschristianrschristian
committed
test: Updating tests
1 parent f8b9027 commit d79cf91

File tree

4 files changed

+53
-56
lines changed

4 files changed

+53
-56
lines changed

‎packages/cli/tests/build.test.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { existsSync } = require('fs');
33
const { readFile } = require('fs').promises;
44
const looksLike = require('html-looks-like');
55
const { create, build } = require('./lib/cli');
6-
const { snapshot } = require('./lib/utils');
6+
const { snapshot, findMatchingKey } = require('./lib/utils');
77
const { subject } = require('./lib/output');
88
const images = require('./images/build');
99
const { promisify } = require('util');
@@ -40,8 +40,9 @@ function testMatch(received, expected) {
4040
let expectedKeys = Object.keys(expected);
4141
expect(receivedKeys).toHaveLength(expectedKeys.length);
4242
for (let k in expected) {
43-
expect(receivedKeys).toContain(k);
44-
expect(received[k]).toBeCloseTo(expected[k]);
43+
let recievedKey = findMatchingKey(k, receivedKeys);
44+
expect(recievedKey).toBeTruthy();
45+
expect(received[recievedKey]).toBeCloseTo(expected[k]);
4546
}
4647
}
4748

‎packages/cli/tests/images/build.js‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const common = {
2-
'polyfills.a827a.js': 5149,
3-
'polyfills.a827a.js.map': 19515,
2+
'polyfills.70f66.js': 6426,
3+
'polyfills.70f66.js.map': 21668,
44
};
55

66
exports.default = exports.full = Object.assign({}, common, {
@@ -11,35 +11,35 @@ exports.default = exports.full = Object.assign({}, common, {
1111
'assets/icons/favicon-16x16.png': 626,
1212
'assets/icons/favicon-32x32.png': 1487,
1313
'assets/icons/mstile-150x150.png': 9050,
14-
'bundle.51d60.js': 21429,
15-
'bundle.51d60.js.map': 103001,
16-
'bundle.7e56a.css': 901,
14+
'bundle.2da73.css': 903,
15+
'bundle.7c9dd.js': 22374,
16+
'bundle.7c9dd.js.map': 111801,
1717
'favicon.ico': 15086,
18-
'index.html': 2034,
18+
'index.html': 2099, //
1919
'manifest.json': 455,
2020
'preact_prerender_data.json': 11,
2121
'push-manifest.json': 812,
22-
'route-home.chunk.9be6a.js': 388,
23-
'route-home.chunk.9be6a.js.map': 626,
24-
'route-home.chunk.e6c71.css': 58,
25-
'route-profile.chunk.62c75.css': 61,
26-
'route-profile.chunk.77929.js': 1250,
27-
'route-profile.chunk.77929.js.map': 2237,
28-
'ssr-build/ssr-bundle.6e806.css': 1281,
29-
'ssr-build/ssr-bundle.6e806.css.map': 1250,
30-
'ssr-build/ssr-bundle.js': 9976,
31-
'ssr-build/ssr-bundle.js.map': 30887,
22+
'route-home.chunk.3cec8.js': 327,
23+
'route-home.chunk.3cec8.js.map': 701,
24+
'route-home.chunk.bcb8a.css': 58,
25+
'route-profile.chunk.6dd80.css': 61,
26+
'route-profile.chunk.ddf94.js': 3514,
27+
'route-profile.chunk.ddf94.js.map': 15454,
28+
'ssr-build/ssr-bundle.aaacf.css': 1281,
29+
'ssr-build/ssr-bundle.aaacf.css.map': 2232,
30+
'ssr-build/ssr-bundle.js': 11937,
31+
'ssr-build/ssr-bundle.js.map': 32557,
3232
});
3333
exports['default-esm'] = exports.full = Object.assign({}, exports.default, {
34-
'bundle.*.esm.js': 21135,
35-
'bundle.*.esm.js.map': 96,
36-
'polyfills.*.esm.js': 5151,
37-
'polyfills.*.esm.js.map': 99,
38-
'route-home.chunk.*.esm.js': 377,
39-
'route-home.chunk.*.esm.js.map': 106,
40-
'route-profile.chunk.*.esm.js': 988,
41-
'route-profile.chunk.*.esm.js.map': 109,
42-
'index.html': 2469,
34+
'bundle.*.esm.js': 22094,
35+
'bundle.*.esm.js.map': 111771,
36+
'polyfills.*.esm.js': 5721,
37+
'polyfills.*.esm.js.map': 21633,
38+
'route-home.chunk.*.esm.js': 316,
39+
'route-home.chunk.*.esm.js.map': 702,
40+
'route-profile.chunk.*.esm.js': 2448,
41+
'route-profile.chunk.*.esm.js.map': 15392,
42+
'index.html': 2193,
4343
'push-manifest.json': 466,
4444
});
4545

@@ -55,18 +55,18 @@ exports.sass = `
5555

5656
exports.sideEffectCss = `
5757
<head>
58-
<meta charset="utf-8">
59-
<title>side-effect-css<\\/title>
60-
<meta name="viewport" content="width=device-width,initial-scale=1">
61-
<meta name="mobile-web-app-capable" content="yes">
62-
<meta name="apple-mobile-web-app-capable" content="yes">
63-
<link rel="apple-touch-icon" href=\\"\\/assets\\/icons\\/apple-touch-icon\\.png\\">
64-
<link rel="manifest" href="\\/manifest\\.json">
65-
<style>h1{background:#673ab8}<\\/style>
66-
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"only x\\" onload=\\"this.media='all'\\">
58+
<meta charset="utf-8">
59+
<title>side-effect-css<\\/title>
60+
<meta name="viewport" content="width=device-width,initial-scale=1">
61+
<meta name="mobile-web-app-capable" content="yes">
62+
<meta name="apple-mobile-web-app-capable" content="yes">
63+
<link rel="apple-touch-icon" href=\\"\\/assets\\/icons\\/apple-touch-icon\\.png\\">
64+
<link rel="manifest" href="\\/manifest\\.json">
65+
<style>h1{background:#673ab8}<\\/style>
66+
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"print\\" onload=\\"this.media='all'\\">
6767
<noscript>
68-
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
69-
</noscript>
68+
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
69+
</noscript>
7070
<\\/head>
7171
`;
7272

@@ -83,10 +83,10 @@ exports.prerender.heads.home = `
8383
<link rel="apple-touch-icon" href=\\"\\/assets\\/icons\\/apple-touch-icon\\.png\\">
8484
<link rel="manifest" href="\\/manifest\\.json">
8585
<style>html{padding:0}<\\/style>
86-
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"only x\\" onload=\\"this.media='all'\\">
86+
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"print\\" onload=\\"this.media='all'\\">
8787
<noscript>
88-
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
89-
</noscript>
88+
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
89+
</noscript>
9090
<\\/head>
9191
`;
9292

@@ -100,10 +100,10 @@ exports.prerender.heads.route66 = `
100100
<link rel="apple-touch-icon" href=\\"\\/assets\\/icons\\/apple-touch-icon\\.png\\">
101101
<link rel="manifest" href="\\/manifest\\.json">
102102
<style>html{padding:0}<\\/style>
103-
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"only x\\" onload=\\"this.media='all'\\">
103+
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"print\\" onload=\\"this.media='all'\\">
104104
<noscript>
105-
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
106-
</noscript>
105+
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
106+
</noscript>
107107
<\\/head>
108108
`;
109109

@@ -117,10 +117,10 @@ exports.prerender.heads.custom = `
117117
<link rel="apple-touch-icon" href=\\"\\/assets\\/icons\\/apple-touch-icon\\.png\\">
118118
<link rel="manifest" href="\\/manifest\\.json">
119119
<style>html{padding:0}<\\/style>
120-
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"only x\\" onload=\\"this.media='all'\\">
120+
<link href=\\"/bundle.\\w{5}.css\\" rel=\\"stylesheet\\" media=\\"print\\" onload=\\"this.media='all'\\">
121121
<noscript>
122-
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
123-
</noscript>
122+
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
123+
</noscript>
124124
<\\/head>
125125
`;
126126

@@ -139,9 +139,9 @@ exports.preload.head = `
139139
<link rel=\\"preload\\" href=\\"\\/route-home\\.chunk\\.\\w{5}\\.js\\" as=\\"script\\">
140140
<link rel=\\"preload\\" href=\\"\\/route-home\\.chunk\\.\\w{5}\\.css\\" as=\\"style\\">
141141
<style>html{padding:0}<\\/style>
142-
<link href=\\"\\/bundle\\.\\w{5}\\.css\\" rel=\\"stylesheet\\" media=\\"only x\\" onload=\\"this.media='all'\\">
142+
<link href=\\"\\/bundle\\.\\w{5}\\.css\\" rel=\\"stylesheet\\" media=\\"print\\" onload=\\"this.media='all'\\">
143143
<noscript>
144-
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
144+
<link rel=\\"stylesheet\\" href=\\"\\/bundle.\\w{5}.css\\">
145145
</noscript>
146146
</head>
147147
`;

‎packages/cli/tests/lib/output.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
const fs = require('fs');
21
const copy = require('ncp');
32
const { resolve } = require('path');
43
const { promisify } = require('util');
@@ -17,9 +16,6 @@ function tmpDir() {
1716
async function subject(name) {
1817
let src = resolve(subjects, name);
1918
let dest = tmpDir();
20-
if (!fs.existsSync(dest)) {
21-
fs.mkdirSync(dest, { recursive: true });
22-
}
2319
await promisify(copy)(src, dest);
2420
return dest;
2521
}

‎packages/cli/tests/lib/utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async function snapshot(dir) {
3434
return out;
3535
}
3636

37-
const hasKey = (key, arr) => arr.find(k => minimatch(key, k)) || false;
37+
const findMatchingKey = (key, arr) => arr.find(k => minimatch(k, key));
3838
const isWithin = (val, tar) =>
3939
val == tar || (val > (1 - PER) * tar && val < (1 + PER) * tar);
4040

@@ -66,6 +66,6 @@ module.exports = {
6666
log,
6767
waitUntil,
6868
sleep,
69-
hasKey,
69+
findMatchingKey,
7070
isWithin,
7171
};

0 commit comments

Comments
 (0)