chore: Integrating upstream build suite changes

packages/cli/global.d.ts

@@ -2,6 +2,7 @@ declare global {
 	namespace jest {
 		interface Matchers<R> {
 			toBeCloseInSize(receivedSize: number, expectedSize: number): R;
+			toFindMatchingKey(receivedKeys: string[]): R;
 		}
 	}
 }

packages/cli/tests/build.test.js

@@ -3,11 +3,12 @@ const { existsSync } = require('fs');
 const { readFile } = require('fs').promises;
 const looksLike = require('html-looks-like');
 const { create, build } = require('./lib/cli');
-const { snapshot, findMatchingKey } = require('./lib/utils');
+const { snapshot } = require('./lib/utils');
 const { subject } = require('./lib/output');
 const images = require('./images/build');
 const { promisify } = require('util');
 const glob = promisify(require('glob').glob);
+const minimatch = require('minimatch');
 
 const prerenderUrlFiles = [
 	'prerender-urls.json',
@@ -39,11 +40,11 @@ function testMatch(received, expected) {
 	let receivedKeys = Object.keys(received);
 	let expectedKeys = Object.keys(expected);
 	expect(receivedKeys).toHaveLength(expectedKeys.length);
-	for (let k in expected) {
-		let receivedKey = findMatchingKey(k, receivedKeys);
-		expect(receivedKey).toBeTruthy();
+	for (let key in expected) {
+		const receivedKey = receivedKeys.find(k => minimatch(k, key));
+		expect(key).toFindMatchingKey(receivedKey);
 
-		expect(receivedKey).toBeCloseInSize(received[receivedKey], expected[k]);
+		expect(receivedKey).toBeCloseInSize(received[receivedKey], expected[key]);
 	}
 }
 

packages/cli/tests/lib/utils.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 const { relative, resolve } = require('path');
 const { stat, readFile, writeFile } = require('fs').promises;
-const minimatch = require('minimatch');
 const pRetry = require('p-retry');
 const { promisify } = require('util');
 const glob = promisify(require('glob').glob);
@@ -41,10 +40,6 @@ async function snapshot(dir) {
 	return out;
 }
 
-function findMatchingKey(key, arr) {
-	return arr.find(k => minimatch(k, key));
-}
-
 async function log(fn, msg) {
 	logger('info', `${msg} - started...`);
 	try {
@@ -67,6 +62,18 @@ function waitUntil(action, errorMessage) {
 const sleep = promisify(setTimeout);
 
 expect.extend({
+	toFindMatchingKey(key, matchingKey) {
+		if (matchingKey) {
+			return {
+				message: () => `expected '${key}'' not to exist in received keys`,
+				pass: true,
+			};
+		}
+		return {
+			message: () => `expected '${key}' to exist in received keys`,
+			pass: false,
+		};
+	},
 	toBeCloseInSize(key, receivedSize, expectedSize) {
 		const expectedMin = expectedSize * 0.95;
 		const expectedMax = expectedSize * 1.05;
@@ -102,5 +109,4 @@ module.exports = {
 	log,
 	waitUntil,
 	sleep,
-	findMatchingKey,
 };