Skip to content

Commit bd612a6

Browse files
fix: mochawesome reporter for windows (#222)
* fix: mochawesome reporter for windows
1 parent 25d53e8 commit bd612a6

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

Diff for: index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ const killProcesses = async (code) => {
138138
}
139139
process.removeAllListeners();
140140
try {
141-
if (isWin() && process) {
142-
process.exit(0);
143-
}
141+
//if (isWin() && process) {
142+
// process.exit(0);
143+
//}
144144
} catch (error) { }
145145
}
146146

@@ -152,9 +152,9 @@ const attachToExitProcessHookup = (processToAttach, processName) => {
152152
}
153153
signals.forEach(function (sig) {
154154
processToAttach.once(sig, async function () {
155-
await killProcesses(sig);
156-
console.log(`Exited from ${processName}`);
157-
processToAttach.removeListener(sig, killProcesses);
155+
await killProcesses(sig);
156+
console.log(`Exited from ${processName}`);
157+
processToAttach.removeListener(sig, killProcesses);
158158
});
159159
});
160160
}

Diff for: postinstall.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,13 @@ const getDevDependencies = (frameworkType) => {
100100
const mochaDeps = [
101101
{ name: "mocha", version: "~5.2.0" },
102102
{ name: "mochawesome", version: "~3.1.2" },
103+
{ name: "chai", version: "~4.1.2" },
103104
{ name: "@types/mocha", version: "~5.2.5" },
104105
{ name: "@types/chai", version: "~4.1.7" },
105106
{ name: "@types/node", version: "~10.12.18" },
106-
]
107-
108-
if (!isWin()) {
109-
mochaDeps.push({ name: "mochawesome", version: "~3.1.2" });
110-
} else {
111-
mochaDeps.push({ name: "mocha-junit-reporter", version: "~1.18.0" });
112-
mochaDeps.push({ name: "mocha-multi", version: "~1.0.1" });
113-
}
107+
{ name: "mocha-junit-reporter", version: "~1.18.0" },
108+
{ name: "mocha-multi", version: "~1.0.1" }
109+
];
114110

115111
return mochaDeps;
116112
}
@@ -286,18 +282,15 @@ const run = async () => {
286282

287283
const samplesFilePostfix = "sample.e2e-spec";
288284

289-
const includeMochawesomeReport = !isWin() && template.testingFramwork === mocha ? `${mochawesome}.` : "";
285+
// const includeMochawesomeReport = !isWin() && template.testingFramwork === mocha ? `${mochawesome}.` : "";
286+
const includeMochawesomeReport = `${mochawesome}.`;
290287
copy(resolve(e2eSamplesFolder, `${template.projectType}.${template.testingFramwork}.${samplesFilePostfix}.${includeMochawesomeReport}${template.fileExt}`), resolve(sampleTestsProjectFolderPath, `${samplesFilePostfix}.${template.fileExt}`));
291288
copy(resolve(e2eSamplesFolder, `${template.testingFramwork}.setup.${includeMochawesomeReport}${template.fileExt}`), resolve(sampleTestsProjectFolderPath, `setup.${template.fileExt}`));
292289

293290
copy(resolve(basicSampleTestsPluginFolderPath, "config"), resolve(sampleTestsProjectFolderPath, "config"));
294291

295-
if (isWin() && template.testingFramwork === mocha) {
296-
copy(resolve(basicSampleTestsPluginFolderPath, "mocha.win.opts"), resolve(sampleTestsProjectFolderPath, "config", `${template.testingFramwork}.opts`));
297-
} else {
298-
const settingsFile = template.testingFramwork === jasmine ? `${template.testingFramwork}.json` : `${template.testingFramwork}.opts`;
299-
copy(resolve(basicSampleTestsPluginFolderPath, settingsFile), resolve(sampleTestsProjectFolderPath, "config", settingsFile));
300-
}
292+
const settingsFile = template.testingFramwork === jasmine ? `${template.testingFramwork}.json` : `${template.testingFramwork}.opts`;
293+
copy(resolve(basicSampleTestsPluginFolderPath, settingsFile), resolve(sampleTestsProjectFolderPath, "config", settingsFile));
301294
}
302295

303296
updatePackageJsonDependencies(packageJson, PROJECT_TYPE, TESTING_FRAMEWORK);

Diff for: samples/mocha.win.opts

-5
This file was deleted.

0 commit comments

Comments
 (0)