Test cleanup

src/bundle/html.test.ts

@@ -2,10 +2,9 @@ import {describe, it} from 'node:test';
 import {ok} from 'node:assert';
 import {join as pathJoin} from 'node:path';
 
-import {fixtureFile} from '../util.spec';
+import {cleanBundlesDir, fixtureFile} from '../util.spec';
 import {Bundle} from '../bundle';
 
-import {cleanBundlesDir} from './otto.spec';
 import {BundleHtml} from './html';
 
 const getDir = async (d: string) => cleanBundlesDir('html', d);

src/bundle/otto.spec.ts

@@ -1,20 +1,11 @@
 import {basename, dirname, join as pathJoin} from 'node:path';
-import {mkdir, rm, writeFile} from 'node:fs/promises';
+import {mkdir, writeFile} from 'node:fs/promises';
 
 import {trimExtension} from '../util';
 import {ProjectorOttoDummy} from '../projector/otto.spec';
 
 import {BundleOtto} from './otto';
 
-export const specBundlesPath = pathJoin('spec', 'bundles');
-
-export async function cleanBundlesDir(...path: string[]) {
-	const dir = pathJoin(specBundlesPath, ...path);
-	await rm(dir, {recursive: true, force: true});
-	await mkdir(dir, {recursive: true});
-	return dir;
-}
-
 export class BundleOttoDummy extends BundleOtto {
 	public readonly projector: ProjectorOttoDummy;
 

src/bundle/otto.test.ts

@@ -13,10 +13,10 @@ import {join as pathJoin, dirname} from 'node:path';
 
 import {fsLchmod, fsLutimes} from '@shockpkg/archive-files';
 
-import {fixtureFile} from '../util.spec';
+import {cleanBundlesDir, fixtureFile} from '../util.spec';
 import {Bundle} from '../bundle';
 
-import {BundleOttoDummy, cleanBundlesDir} from './otto.spec';
+import {BundleOttoDummy} from './otto.spec';
 import {BundleOtto} from './otto';
 
 const getDir = async (d: string) => cleanBundlesDir('otto', 'dummy', d);

src/bundle/otto/mac.test.ts

@@ -3,8 +3,7 @@ import {ok} from 'node:assert';
 import {join as pathJoin} from 'node:path';
 
 import {listSamples} from '../../projector/otto/mac.spec';
-import {cleanBundlesDir} from '../otto.spec';
-import {fixtureFile, getPackageFile} from '../../util.spec';
+import {cleanBundlesDir, fixtureFile, getPackageFile} from '../../util.spec';
 import {BundleOtto} from '../otto';
 
 import {BundleOttoMac} from './mac';

src/bundle/otto/windows.test.ts

@@ -3,8 +3,7 @@ import {ok} from 'node:assert';
 import {join as pathJoin} from 'node:path';
 
 import {listSamples, versionStrings} from '../../projector/otto/windows.spec';
-import {cleanBundlesDir} from '../otto.spec';
-import {fixtureFile, getPackageFile} from '../../util.spec';
+import {cleanBundlesDir, fixtureFile, getPackageFile} from '../../util.spec';
 import {BundleOtto} from '../otto';
 
 import {BundleOttoWindows} from './windows';

src/util.spec.ts

@@ -16,6 +16,7 @@ export function shouldTest(name: string) {
 
 export const specFixturesPath = pathJoin('spec', 'fixtures');
 export const specProjectorsPath = pathJoin('spec', 'projectors');
+export const specBundlesPath = pathJoin('spec', 'bundles');
 
 export function fixtureFile(name: string) {
 	return pathJoin(specFixturesPath, name);
@@ -32,6 +33,13 @@ export async function cleanProjectorDir(...path: string[]) {
 	return dir;
 }
 
+export async function cleanBundlesDir(...path: string[]) {
+	const dir = pathJoin(specBundlesPath, ...path);
+	await rm(dir, {recursive: true, force: true});
+	await mkdir(dir, {recursive: true});
+	return dir;
+}
+
 let getInstalledPackagesCache: string[] | null = null;
 export function getInstalledPackagesSync() {
 	if (!getInstalledPackagesCache) {