Fix an issue with RushCommandLineParser tests on Mac and Linux.

iclanton · iclanton · commit d98d2282d25e · 2019-02-12T12:17:59.000-08:00
diff --git a/apps/rush-lib/__mocks__/child_process.js b/apps/rush-lib/__mocks__/child_process.js
@@ -4,6 +4,7 @@
 const EventEmitter = require('events');
 
 const childProcess = jest.genMockFromModule('child_process');
+const childProcessActual = jest.requireActual('child_process');
 childProcess.spawn.mockImplementation(spawn);
 childProcess.__setSpawnMockConfig = setSpawnMockConfig;
 
@@ -59,4 +60,9 @@ function spawn(file, args, options) {
   return cp;
 }
 
+/**
+ * Ensure the real spawnSync function is used, otherwise LockFile breaks.
+ */
+childProcess.spawnSync = childProcessActual.spawnSync;
+
 module.exports = childProcess;
diff --git a/apps/rush-lib/src/cli/test/RushCommandLineParser.test.ts b/apps/rush-lib/src/cli/test/RushCommandLineParser.test.ts
@@ -3,8 +3,24 @@
 
 // Mock child_process so we can verify tasks are (or are not) invoked as we expect
 jest.mock('child_process');
-// Mock RushCommandLineParser itself to prevent `process.exit` to be called on failure
-jest.mock('../RushCommandLineParser', rushCommandLineParserMockFactory);
+
+/**
+ * Mock RushCommandLineParser itself to prevent `process.exit` to be called on failure
+ */
+jest.mock('../RushCommandLineParser', () => {
+  // tslint:disable-next-line: no-any
+  const actualModule: any = jest.requireActual('../RushCommandLineParser');
+  if (actualModule.RushCommandLineParser) {
+    // Stub out the troublesome method that calls `process.exit`
+    actualModule.RushCommandLineParser.prototype._reportErrorAndSetExitCode = mockReportErrorAndSetExitCode;
+  }
+  return actualModule;
+
+  function mockReportErrorAndSetExitCode(error: Error): void {
+    // Just rethrow the error so the unit tests can catch it
+    throw error;
+  }
+});
 
 import { resolve } from 'path';
 import { ChildProcessModuleMock, ISpawnMockConfig } from 'child_process';
@@ -48,27 +64,6 @@ function getCommandLineParserInstance(repoName: string, taskName: string): IPars
   };
 }
 
-/**
- * Create a monkey patch of RushCommandLineParser so unit tests can validate failure cases.
- */
-// tslint:disable-next-line: no-any
-function rushCommandLineParserMockFactory(): any {
-  // tslint:disable-next-line: no-any
-  const actualModule: any = jest.requireActual('../RushCommandLineParser');
-  if (actualModule.RushCommandLineParser) {
-    // Stub out the troublesome method that calls `process.exit`
-    actualModule.RushCommandLineParser.prototype._reportErrorAndSetExitCode = mockReportErrorAndSetExitCode;
-  }
-  return actualModule;
-
-  //////////////////
-
-  function mockReportErrorAndSetExitCode(error: Error): void {
-    // Just rethrow the error so the unit tests can catch it
-    throw error;
-  }
-}
-
 /**
  * Configure the `child_process` `spawn` mock for these tests. This relies on the mock implementation
  * in `__mocks__/child_process.js`.
