revert class constructor

withhaibun · Jan 17, 2025 · a769467 · a769467
1 parent ae87b73
commit a769467
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/modules/core/src/lib/test/lib.ts b/modules/core/src/lib/test/lib.ts
@@ -20,7 +20,7 @@ export async function getCreateSteppers(steppers: string[], addSteppers?: CStepp
 	return await createSteppers(csteppers.concat(addSteppers || []));
 }
 
-export const testVStep = (name: string, action, base = TEST_BASE): TFeatureStep => ({
+export const testFeatureStep = (name: string, action, base = TEST_BASE): TFeatureStep => ({
 	source: { ...withNameType(base, name, '') },
 	in: name,
 	seq: 0,
@@ -35,7 +35,7 @@ export async function getTestEnv(useSteppers: string[], test: string, world: TWo
 	const resolver = new Resolver(steppers);
 	const actions = resolver.findActionableSteps(test);
 
-	const featureStep = testVStep('test', actions[0]);
+	const featureStep = testFeatureStep('test', actions[0]);
 
 	return { world, featureStep, csteppers, steppers };
 }

diff --git a/modules/core/src/lib/util/index.ts b/modules/core/src/lib/util/index.ts
@@ -182,7 +182,7 @@ export async function verifyRequiredOptions(steppers: CStepper[], options: TModu
 }
 
 export function getStepperOptionName(stepper: AStepper | CStepper, name: string) {
-	if ((stepper as CStepper).prototype) {
+	if ((stepper as CStepper)?.prototype) {
 		return getPre((stepper as CStepper).prototype) + name;
 	}
 	return getPre(stepper as AStepper) + name;

diff --git a/modules/core/src/lib/util/util.test.ts b/modules/core/src/lib/util/util.test.ts
@@ -119,7 +119,6 @@ describe('findHandlers', () => {
 			TEST_HANDLER
 		);
 		expect(found.length).toBe(1);
-		console.log('name', found[0].stepper);
 		expect(constructorName(found[0].stepper)).toBe('FallbackTestStepperHandler');
 	});
 });
@@ -145,22 +144,21 @@ describe('findStepperFromOptions', () => {
 	};
 
 	it('finds from single option', async () => {
-		const ts = await util.createSteppers([TestOptionsStepper])[0];
+		const ts = new TestOptionsStepper();
 		const steppers = await getCreateSteppers([], [TestOptionsStepper]);
 		const options = { [util.getStepperOptionName(ts, 'A')]: 'TestOptionsStepper' };
 		const s = util.findStepperFromOption(steppers, ts, options, 'A');
 		expect(s).toBeDefined();
 	});
 	it('finds from last multiple options', async () => {
-		const ts = util.createSteppers([TestOptionsStepper])[0];
+		const ts = new TestOptionsStepper();
 		const steppers = await getCreateSteppers([], [TestOptionsStepper]);
 		const options = { [util.getStepperOptionName(ts, 'B')]: 'TestOptionsStepper' };
 		const s = await util.findStepperFromOption(steppers, ts, options, 'A', 'B');
 		expect(s).toBeDefined();
 	});
-	// FIXME vitest where is TestSteps2 coming from?
 	it('finds from first multiple options', async () => {
-		const ts = await util.createSteppers([TestOptionsStepper])[0];
+		const ts = new TestOptionsStepper();
 		const steppers = await getCreateSteppers([], [TestSteps, TestOptionsStepper]);
 		const options = {
 			[util.getStepperOptionName(ts, 'optionA')]: 'TestSteps',
@@ -200,7 +198,7 @@ describe('verifyRequiredOptions', () => {
 		};
 	}
 	it('has option', async () => {
-		const toswq = await util.createSteppers([TestOptionsStepperWithReauired])[0];
+		const toswq = new TestOptionsStepperWithReauired();
 		const options = { [util.getStepperOptionName(toswq, 'A')]: 'TestSteps' };
 		await expect(util.verifyRequiredOptions([TestOptionsStepperWithReauired], options)).resolves.not.toThrow();
 	});

diff --git a/modules/core/src/phases/Resolver.ts b/modules/core/src/phases/Resolver.ts
@@ -44,14 +44,14 @@ export class Resolver {
 			} else if (actions.length < 1) {
 				throw Error(`no step found for ${featureLine.line} in ${feature.path} from ${describeSteppers(this.steppers)}`);
 			}
-			const featureStep = this.getVStep(featureLine, seq, actions[0]);
+			const featureStep = this.getFeatureStep(featureLine, seq, actions[0]);
 			featureSteps.push(featureStep);
 		}
 
 		return featureSteps;
 	}
 
-	getVStep(featureLine: TExpandedLine, seq: number, action: TStepAction): TFeatureStep {
+	getFeatureStep(featureLine: TExpandedLine, seq: number, action: TStepAction): TFeatureStep {
 		return { source: featureLine.feature, in: featureLine.line, seq, action };
 	}
 

diff --git a/modules/storage-mem/src/storage-mem.test.ts b/modules/storage-mem/src/storage-mem.test.ts
@@ -8,7 +8,6 @@ import StorageMem from './storage-mem.js';
 import { Timer } from '@haibun/core/build/lib/Timer.js';
 import { EMediaTypes } from '@haibun/domain-storage/build/media-types.js';
 import { TRACKS_FILE } from '@haibun/core/build/lib/LogHistory.js';
-import { TTree } from '@haibun/domain-storage/build/AStorage.js';
 
 const { key } = Timer;
 

diff --git a/modules/web-playwright/src/BrowserFactory.test.ts b/modules/web-playwright/src/BrowserFactory.test.ts
@@ -22,6 +22,10 @@ describe("types", () => {
     await BrowserFactory.closeBrowsers();
   });
   it("missing type", async () => {
+    await expect(async () => await BrowserFactory.getBrowserFactory(new Logger(LOGGER_NOTHING), ({
+      ...browserContextOptions,
+      type: 'noodles'
+    } as any) as TBrowserFactoryOptions)).rejects.toThrow();
     await expect(async () => await BrowserFactory.getBrowserFactory(new Logger(LOGGER_NOTHING), ({
       ...browserContextOptions,
       type: 'noodles'