Skip to content

Commit 92b138b

Browse files
committed
refactor: Restrucutre html generation method in loadTestCaseFixture
1 parent d77a3ae commit 92b138b

File tree

1 file changed

+9
-68
lines changed

1 file changed

+9
-68
lines changed

packages/test-case-component/src/loadTestCaseFixture.ts

Lines changed: 9 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -13,79 +13,20 @@ type StepType = { stepName: "initialState" | "middleState" | "finalState" }
1313
export type DataFixture = TestCaseFixture & StepType
1414

1515
export async function loadTestCaseFixture(data: loadFixtureProps) {
16-
try {
17-
const before = await getBefore({
18-
stateName: "initialState",
19-
state: data.initialState,
20-
languageId: data.languageId,
21-
});
22-
23-
const during = await getDuring(data);
24-
25-
const after = await getAfter({
26-
stateName: "finalState",
27-
state: data.finalState,
28-
languageId: data.languageId,
29-
});
30-
31-
return {
32-
language: data.languageId,
33-
command: data.command.spokenForm,
34-
during,
35-
before,
36-
after,
37-
filename: data.filename,
38-
};
39-
} catch (e) {
40-
console.log("error", e);
41-
console.log(JSON.stringify(data, null, 2));
42-
throw e;
43-
}
44-
}
16+
const { before, during, after } = await generateHtml(data)
4517

46-
type Foo = TestCaseSnapshot & TargetPlainObject;
18+
const { command, filename, languageId: language } = data
4719

48-
async function getAfter({
49-
stateName,
50-
state,
51-
languageId,
52-
}: {
53-
stateName: string;
54-
state: Foo;
55-
languageId: BundledLanguage;
56-
}) {
57-
if (!state) {
58-
throw new Error("finalState is undefined");
20+
const returnObj = {
21+
before, during, after, command, filename, language
5922
}
60-
return await safeGenerateHtml({ stateName, state, languageId });
61-
}
23+
try {
6224

63-
type DataFixture = Partial<TestCaseFixture & TargetPlainObject>
25+
return returnObj
6426

65-
async function getDuring(data: DataFixture) {
66-
const { command, ide } = data
67-
const stateName = "middleState"
68-
const state = data.initialState
69-
const languageId = data.languageId as BundledLanguage
70-
const genObj: TestCaseSnapshot & { stateName: string } = { stateName, state, languageId, raw: data }
71-
if (command) {
72-
genObj.command = command
73-
}
74-
if (ide) {
75-
genObj.ide = ide
27+
} catch (e) {
28+
console.error("error", e);
29+
throw e;
7630
}
77-
78-
return await generateHtml(genObj);
7931
}
8032

81-
async function getBefore({
82-
stateName,
83-
state,
84-
languageId,
85-
}: {
86-
stateName: string;
87-
state: TestCaseSnapshot;
88-
languageId: BundledLanguage;
89-
}) {
90-
return await safeGenerateHtml({ stateName, state, languageId });
91-
}

0 commit comments

Comments
 (0)