feat: testBrowser resolves boolean telling if tests ran

Author: coreyfarrell

README.md

@@ -21,8 +21,12 @@ const pages = {
 
 async function main() {
 	const baseURL = await startHTTPD();
-	await testBrowser(t, 'firefox', baseURL, pages);
-	await testBrowser(t, 'chrome', baseURL, pages);
+	if (await testBrowser(t, 'firefox', baseURL, pages)) {
+		console.log('Firefox tests ran');
+	}
+	if (await testBrowser(t, 'chrome', baseURL, pages)) {
+		console.log('Chrome tests ran');
+	}
 }
 
 main().catch(t.error);

index.js

@@ -70,7 +70,7 @@ export async function testBrowser(t, browser, daemon, pages) {
 			() => {}
 		);
 
-		return;
+		return false;
 	}
 
 	const baseURL = await getBaseURL(daemon);
@@ -109,4 +109,6 @@ export async function testBrowser(t, browser, daemon, pages) {
 
 		global.__coverage__ = coverageMap.toJSON();
 	}
+
+	return true;
 }

tap-snapshots/test.js-TAP.test.cjs

@@ -5,15 +5,15 @@
  * Make sure to inspect the output below.  Do not ignore changes!
  */
 'use strict'
-exports[`test.js TAP chrome page2.html > must match snapshot 1`] = `
+exports[`test.js TAP firefox page2.html > must match snapshot 1`] = `
 Buffer <
   0000: 8950 4e47 0d0a 1a0a 0000 000d 4948 4452 0000 000a 0000 000a 0806 0000 008d 32cf  .PNG........IHDR..............2.
   0020: bd00 0000 2449 4441 5478 018d c101 0100 0008 8330 a47f e75b 81ed 0623 9048 2289  ....$IDATx.........0...[...#.H".
   0040: 2492 4822 8924 92e8 013d 9c02 12e9 563f 9000 0000 0049 454e 44ae 4260 82         $.H".$...=....V?.....IEND.B\`.
 >
 `
 
-exports[`test.js TAP firefox page2.html > must match snapshot 1`] = `
+exports[`test.js TAP firefox page2.html > must match snapshot 2`] = `
 Buffer <
   0000: 8950 4e47 0d0a 1a0a 0000 000d 4948 4452 0000 000a 0000 000a 0806 0000 008d 32cf  .PNG........IHDR..............2.
   0020: bd00 0000 2449 4441 5478 018d c101 0100 0008 8330 a47f e75b 81ed 0623 9048 2289  ....$IDATx.........0...[...#.H".

test.js

@@ -35,12 +35,14 @@ async function main() {
 	const baseURL = `http://localhost:${daemon.server.address().port}/`;
 
 	await t.rejects(testBrowser(t), TypeError);
-	await testBrowser(t, deadBrowser, baseURL, {
+	let tested = await testBrowser(t, deadBrowser, baseURL, {
 		async 'page1.html'(t) {
 			t.fail('should not get here');
 		}
 	});
 
+	t.equal(tested, false);
+
 	await t.test('after deadBrowser', async t => t.same(global.__coverage__, {}));
 
 	let gotCoverage;
@@ -57,12 +59,20 @@ async function main() {
 		}
 	};
 
-	await testBrowser(t, 'chrome', baseURL, pages);
-	await t.test('after chrome', async t => {
-		t.same(JSON.parse(JSON.stringify(global.__coverage__)), gotCoverage);
-		t.ok(Object.keys(global.__coverage__).length);
-	});
-	global.__coverage__ = {};
+	const standardTest = async browser => {
+		tested = await testBrowser(t, browser, baseURL, pages);
+		if (tested) {
+			await t.test(`after ${browser}`, async t => {
+				t.same(JSON.parse(JSON.stringify(global.__coverage__)), gotCoverage);
+				t.ok(Object.keys(global.__coverage__).length);
+			});
+
+			global.__coverage__ = {};
+		}
+	};
+
+	await standardTest('chrome');
+	await standardTest('firefox');
 
 	const simulateDaemon = {
 		calls: {
@@ -81,7 +91,7 @@ async function main() {
 			return baseURL;
 		}
 	};
-	await testBrowser(t, 'firefox', simulateDaemon, {
+	tested = await testBrowser(t, 'firefox', simulateDaemon, {
 		async 'page1.html'(t, selenium) {
 			t.same(simulateDaemon.calls, {
 				start: 1,
@@ -99,15 +109,17 @@ async function main() {
 			await pages['page2.html'](t, selenium);
 		}
 	});
-	await t.test('after firefox', async t => {
-		t.same(simulateDaemon.calls, {
-			start: 1,
-			stop: 1,
-			url: 1
+	if (tested) {
+		await t.test('after firefox', async t => {
+			t.same(simulateDaemon.calls, {
+				start: 1,
+				stop: 1,
+				url: 1
+			});
+			t.same(JSON.parse(JSON.stringify(global.__coverage__)), gotCoverage);
+			t.ok(Object.keys(global.__coverage__).length);
 		});
-		t.same(JSON.parse(JSON.stringify(global.__coverage__)), gotCoverage);
-		t.ok(Object.keys(global.__coverage__).length);
-	});
+	}
 
 	t.test('platformBin for linux', platformTest('linux'));
 	t.test('platformBin for mac', platformTest('mac'));