Kaynağa Gözat

Attempt to fix `done() called multiple times` error on node 10

sanex3339 5 yıl önce
ebeveyn
işleme
65c41c2778

+ 4 - 4
test/functional-tests/custom-code-helpers/self-defending/templates/SelfDefendingTemplate.spec.ts

@@ -21,7 +21,7 @@ describe('SelfDefendingTemplate', function () {
         let obfuscatedCode: string,
             evaluationResult: number = 0;
 
-        beforeEach((done) => {
+        before((done) => {
             const code: string = readFileAsString(__dirname + '/fixtures/input.js');
 
             obfuscatedCode = JavaScriptObfuscator.obfuscate(
@@ -60,7 +60,7 @@ describe('SelfDefendingTemplate', function () {
         let obfuscatedCode: string,
             evaluationResult: number = 0;
 
-        beforeEach((done) => {
+        before((done) => {
             const code: string = readFileAsString(__dirname + '/fixtures/input.js');
 
             obfuscatedCode = JavaScriptObfuscator.obfuscate(
@@ -99,7 +99,7 @@ describe('SelfDefendingTemplate', function () {
         let obfuscatedCode: string,
             evaluationResult: number = 0;
 
-        beforeEach((done) => {
+        before((done) => {
             const code: string = readFileAsString(__dirname + '/fixtures/input.js');
 
             obfuscatedCode = JavaScriptObfuscator.obfuscate(
@@ -139,7 +139,7 @@ describe('SelfDefendingTemplate', function () {
         let obfuscatedCode: string,
             evaluationResult: number = 0;
 
-        beforeEach((done) => {
+        before((done) => {
             const code: string = readFileAsString(__dirname + '/fixtures/input.js');
 
             obfuscatedCode = JavaScriptObfuscator.obfuscate(

+ 3 - 3
test/helpers/evaluateInWorker.ts

@@ -17,8 +17,8 @@ export async function evaluateInWorker(
 ): Promise<void> {
     const evaluationWorker = await spawn(new Worker('./workers/evaluation-worker'));
 
-    const timeout = setTimeout(() => {
-        Thread.terminate(evaluationWorker);
+    const timeout = setTimeout(async () => {
+        await Thread.terminate(evaluationWorker);
         timeoutCallback();
     }, waitTimeout);
 
@@ -30,6 +30,6 @@ export async function evaluateInWorker(
         errorCallback(error, code);
     } finally {
         clearTimeout(timeout);
-        Thread.terminate(evaluationWorker);
+        await Thread.terminate(evaluationWorker);
     }
 }