tweak test

jestjs · Nov 9, 2018 · 799b4e1 · 799b4e1
1 parent d39a7c7
commit 799b4e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/packages/jest-cli/src/__tests__/run_jest.test.js b/packages/jest-cli/src/__tests__/run_jest.test.js
@@ -4,35 +4,22 @@ import runJest from '../runJest';
 
 jest.mock('jest-util');
 
-const processErrWriteFn = process.stderr.write;
 describe('runJest', () => {
-  let stderrSpy;
-  beforeEach(async () => {
-    process.exit = jest.fn();
-    process.stderr.write = jest.fn();
-    process.stderr.write.mockReset();
-    stderrSpy = jest.spyOn(process.stderr, 'write');
+  test('when watch is set then print error and exit process', async () => {
+    jest.spyOn(process, 'exit').mockImplementation(() => {});
 
     await runJest({
-      changedFilesPromise: Promise.resolve({repos: {git: {size: 0}}}),
+      changedFilesPromise: Promise.resolve({repos: {git: new Set()}}),
       contexts: [],
       globalConfig: {watch: true},
       onComplete: () => null,
       outputStream: {},
       startRun: {},
       testWatcher: {isInterrupted: () => true},
     });
-  });
 
-  afterEach(() => {
-    process.stderr.write = processErrWriteFn;
-  });
+    await new Promise(process.nextTick);
 
-  test('when watch is set then exit process', () => {
     expect(process.exit).toHaveBeenCalledWith(1);
   });
-
-  test('when watch is set then an error message is printed', () => {
-    expect(stderrSpy).toHaveBeenCalled();
-  });
 });
diff --git a/packages/jest-runner/src/run_test.js b/packages/jest-runner/src/run_test.js
@@ -144,9 +144,9 @@ async function runTestInternal(
   const originalStdOutWrite = testStdOut.write;
   const originalStdErrWrite = testStdErr.write;
 
-  testStdOut.write = (chunk, ...rest) => {
+  testStdOut.write = (chunk, encoding, ...rest) => {
     const type = 'write';
-    const message = chunk.toString();
+    const message = chunk.toString(encoding);
     const api = 'process.stdout';
 
     if (buffer) {
@@ -162,12 +162,12 @@ async function runTestInternal(
       consoleOut.write(consoleFormatter(type, message, api, 3));
     }
 
-    return originalStdOutWrite.call(testStdOut, chunk, ...rest);
+    return originalStdOutWrite.call(testStdOut, chunk, encoding, ...rest);
   };
 
-  testStdErr.write = (chunk, ...rest) => {
+  testStdErr.write = (chunk, encoding, ...rest) => {
     const type = 'write';
-    const message = chunk.toString();
+    const message = chunk.toString(encoding);
     const api = 'process.stderr';
 
     if (buffer) {
@@ -183,7 +183,7 @@ async function runTestInternal(
       consoleOut.write(consoleFormatter(type, message, api, 3));
     }
 
-    return originalStdErrWrite.call(testStdErr, chunk, ...rest);
+    return originalStdErrWrite.call(testStdErr, chunk, encoding, ...rest);
   };
 
   const environment = new TestEnvironment(config, {console: testConsole});