chore(node): make tests more explicit

nrwl · Sep 23, 2021 · 3e6afa8 · 3e6afa8
1 parent 4bc76d0
commit 3e6afa8
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 29 deletions.
diff --git a/packages/node/src/executors/execute/execute.impl.spec.ts b/packages/node/src/executors/execute/execute.impl.spec.ts
@@ -498,6 +498,7 @@ describe('NodeExecuteBuilder', () => {
       beforeEach(() => {
         (devkit.runExecutor as any).mockImplementation(async function* () {
           yield { success: true, outfile: 'outfile.js' };
+          await new Promise((resolve) => setTimeout(resolve, 1));
           yield { success: true, outfile: 'outfile.js' };
         });
       });
@@ -546,6 +547,12 @@ describe('NodeExecuteBuilder', () => {
       });
 
       it('Yield build and process events cooperatively', async () => {
+        const expectedEvents = [
+          { outfile: 'outfile.js', success: true },
+          { exitCode: 1 },
+          { outfile: 'outfile.js', success: true },
+          { exitCode: 1 },
+        ];
         const events = [];
         for await (const event of executeExecutor(
           {
@@ -562,7 +569,7 @@ describe('NodeExecuteBuilder', () => {
           events.push(event);
         }
 
-        expect(events).toHaveLength(4);
+        expect(events).toEqual(expectedEvents);
       });
     });
   });

diff --git a/packages/node/src/executors/execute/execute.impl.ts b/packages/node/src/executors/execute/execute.impl.ts
@@ -25,7 +25,7 @@ export const enum InspectType {
 
 export { NodeExecuteBuilderOptions } from '../../utils/types';
 
-type ScheduledEvent = NodeBuildEvent|SubProcessEvent
+type ScheduledEvent = NodeBuildEvent | SubProcessEvent;
 
 type TypedIterator =
   | {
@@ -37,10 +37,14 @@ type TypedIterator =
       iterator: AsyncIterator<SubProcessEvent, undefined>;
     };
 
-type MappedIteratorValue<T extends TypedIterator> =
-    T extends Extract<T, { type: 'build' }> ? T & IteratorResult<NodeBuildEvent, undefined> :
-        T extends Extract<T, {type: 'process'}> ? T & IteratorResult<SubProcessEvent, undefined> :
-            never;
+type MappedIteratorValue<T extends TypedIterator> = T extends Extract<
+  T,
+  { type: 'build' }
+>
+  ? T & IteratorResult<NodeBuildEvent, undefined>
+  : T extends Extract<T, { type: 'process' }>
+  ? T & IteratorResult<SubProcessEvent, undefined>
+  : never;
 
 export async function* executeExecutor(
   options: NodeExecuteBuilderOptions,
@@ -69,19 +73,21 @@ export async function* executeExecutor(
     }
   }
 
-  yield * scheduleBuildAndProcessEvents(
-      startBuild(options, context),
-      processRunner,
-      options
-  )
+  yield* scheduleBuildAndProcessEvents(
+    startBuild(options, context),
+    processRunner,
+    options
+  );
 }
 
-const mapNextIterValue = <T extends TypedIterator>(typedIter: T): Promise<MappedIteratorValue<T>> =>
-    typedIter.iterator.next().then((result) => ({
-      iterator: typedIter.iterator,
-      type: typedIter.type,
-      ...result,
-    }))
+const mapNextIterValue = <T extends TypedIterator>(
+  typedIter: T
+): Promise<MappedIteratorValue<T>> =>
+  typedIter.iterator.next().then((result) => ({
+    iterator: typedIter.iterator,
+    type: typedIter.type,
+    ...result,
+  }));
 
 async function* scheduleBuildAndProcessEvents(
   buildIterator: AsyncIterator<NodeBuildEvent>,
@@ -92,7 +98,10 @@ async function* scheduleBuildAndProcessEvents(
     AsyncIterator<ScheduledEvent>,
     ReturnType<typeof mapNextIterValue>
   >([
-    [buildIterator, mapNextIterValue({ type: 'build', iterator: buildIterator })],
+    [
+      buildIterator,
+      mapNextIterValue({ type: 'build', iterator: buildIterator }),
+    ],
   ]);
 
   while (iteratorMap.size > 0) {
@@ -104,17 +113,17 @@ async function* scheduleBuildAndProcessEvents(
     }
 
     if (result.type === 'build') {
-        if(!result.value.success){
-          logger.error('There was an error with the build. See above.');
-          logger.info(`${result.value.outfile} was not restarted.`);
-        } else {
-          await subProcessRunner.handleBuildEvent(result.value);
-
-          iteratorMap.set(
-              subProcessRunner,
-              mapNextIterValue({ type: 'process', iterator: subProcessRunner })
-          );
-        }
+      if (!result.value.success) {
+        logger.error('There was an error with the build. See above.');
+        logger.info(`${result.value.outfile} was not restarted.`);
+      } else {
+        await subProcessRunner.handleBuildEvent(result.value);
+
+        iteratorMap.set(
+          subProcessRunner,
+          mapNextIterValue({ type: 'process', iterator: subProcessRunner })
+        );
+      }
     }
 
     iteratorMap.set(result.iterator, mapNextIterValue(result));