chore: remove some node 10 compat code (#12515)

jestjs · Feb 28, 2022 · 59a7af7 · 59a7af7
1 parent a20bd2c
commit 59a7af7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 71 deletions.
diff --git a/packages/jest-circus/src/formatNodeAssertErrors.ts b/packages/jest-circus/src/formatNodeAssertErrors.ts
@@ -79,10 +79,6 @@ const getOperatorName = (operator: string | undefined, stack: string) => {
   if (stack.match('.throws')) {
     return 'throws';
   }
-  // this fallback is only needed for versions older than node 10
-  if (stack.match('.fail')) {
-    return 'fail';
-  }
   return '';
 };
 

diff --git a/packages/jest-jasmine2/src/assertionErrorMessage.ts b/packages/jest-jasmine2/src/assertionErrorMessage.ts
@@ -42,10 +42,6 @@ const getOperatorName = (operator: string | null, stack: string) => {
   if (stack.match('.throws')) {
     return 'throws';
   }
-  // this fallback is only needed for versions older than node 10
-  if (stack.match('.fail')) {
-    return 'fail';
-  }
   return '';
 };
 

diff --git a/packages/jest-source-map/src/__tests__/getCallsite.test.ts b/packages/jest-source-map/src/__tests__/getCallsite.test.ts
@@ -9,12 +9,7 @@ import * as fs from 'graceful-fs';
 import SourceMap from 'source-map';
 import getCallsite from '../getCallsite';
 
-// Node 10.5.x compatibility
-jest.mock('graceful-fs', () => ({
-  ...jest.createMockFromModule<typeof import('fs')>('fs'),
-  ReadStream: jest.requireActual('fs').ReadStream,
-  WriteStream: jest.requireActual('fs').WriteStream,
-}));
+jest.mock('graceful-fs');
 
 describe('getCallsite', () => {
   test('without source map', () => {

diff --git a/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts b/packages/jest-transform/src/__tests__/ScriptTransformer.test.ts
@@ -11,30 +11,40 @@ import type {Config} from '@jest/types';
 import type {Options, ShouldInstrumentOptions, Transformer} from '../types';
 
 jest
-  .mock('graceful-fs', () =>
-    // Node 10.5.x compatibility
-    ({
-      ...jest.createMockFromModule('fs'),
-      ReadStream: jest.requireActual('fs').ReadStream,
-      WriteStream: jest.requireActual('fs').WriteStream,
-      readFileSync: jest.fn(path => {
-        if (mockFs[path]) {
-          return mockFs[path];
-        }
-
-        throw new Error(`Cannot read path '${path}'.`);
-      }),
-      statSync: path => ({
-        isFile: () => !!mockFs[path],
-        mtime: {getTime: () => 42, toString: () => '42'},
-      }),
-    }),
-  )
   .mock('graceful-fs', () => ({
     ...jest.requireActual('graceful-fs'),
-    realPathSync: {
-      native: dirInput => dirInput,
-    },
+    /* eslint-disable sort-keys */
+    readFileSync: jest.fn((path, options) => {
+      mockInvariant(typeof path === 'string');
+
+      expect(options).toBe('utf8');
+      if (mockFs[path]) {
+        return mockFs[path];
+      }
+
+      throw new Error(`Cannot read path '${path}'.`);
+    }),
+    writeFileSync: jest.fn((path, data, options) => {
+      mockInvariant(typeof path === 'string');
+      expect(options).toBe('utf8');
+      mockFs[path] = data;
+    }),
+
+    unlinkSync: jest.fn(),
+    statSync: jest.fn(path => ({
+      isFile() {
+        mockInvariant(typeof path === 'string');
+        return !!mockFs[path];
+      },
+      mtime: {getTime: () => 42, toString: () => '42'},
+    })),
+
+    existsSync: jest.fn(path => {
+      mockInvariant(typeof path === 'string');
+
+      return !!mockFs[path];
+    }),
+    /* eslint-enable */
   }))
   .mock('jest-haste-map', () => ({
     getStatic() {
@@ -257,36 +267,6 @@ describe('ScriptTransformer', () => {
     });
 
     fs = require('graceful-fs');
-    fs.readFileSync = jest.fn((path, options) => {
-      invariant(typeof path === 'string');
-
-      expect(options).toBe('utf8');
-      if (mockFs[path]) {
-        return mockFs[path];
-      }
-
-      throw new Error(`Cannot read path '${path}'.`);
-    });
-    fs.writeFileSync = jest.fn((path, data, options) => {
-      invariant(typeof path === 'string');
-      expect(options).toBe('utf8');
-      mockFs[path] = data;
-    });
-
-    fs.unlinkSync = jest.fn();
-    fs.statSync = jest.fn(path => ({
-      isFile() {
-        invariant(typeof path === 'string');
-        return !!mockFs[path];
-      },
-      mtime: {getTime: () => 42, toString: () => '42'},
-    }));
-
-    fs.existsSync = jest.fn(path => {
-      invariant(typeof path === 'string');
-
-      return !!mockFs[path];
-    });
 
     writeFileAtomic = require('write-file-atomic');
 
@@ -410,7 +390,7 @@ describe('ScriptTransformer', () => {
     ];
 
     incorrectReturnValues.forEach(([returnValue, filePath]) => {
-      invariant(typeof filePath === 'string');
+      mockInvariant(typeof filePath === 'string');
       require('passthrough-preprocessor').process.mockReturnValue(returnValue);
       expect(() =>
         scriptTransformer.transform(filePath, getCoverageOptions()),
@@ -423,7 +403,7 @@ describe('ScriptTransformer', () => {
     ];
 
     correctReturnValues.forEach(([returnValue, filePath]) => {
-      invariant(typeof filePath === 'string');
+      mockInvariant(typeof filePath === 'string');
       require('passthrough-preprocessor').process.mockReturnValue(returnValue);
       expect(() =>
         scriptTransformer.transform(filePath, getCoverageOptions()),
@@ -1844,7 +1824,7 @@ function getCoverageOptions(
   };
 }
 
-function invariant(subject: unknown): asserts subject {
+function mockInvariant(subject: unknown): asserts subject {
   if (!subject) {
     throw new Error('Went boom');
   }

diff --git a/packages/pretty-format/src/__tests__/DOMCollection.test.ts b/packages/pretty-format/src/__tests__/DOMCollection.test.ts
@@ -125,8 +125,6 @@ describe('DOMCollection plugin for list items', () => {
     expect(select.options).toPrettyPrintTo(expectedHTMLOptionsCollection);
   });
 
-  // When Jest upgrades to a version of jsdom later than 12.2.0,
-  // the class name might become HTMLFormControlsCollection
   const expectedHTMLFormControlsCollection = [
     'HTMLCollection [',
     '  <select>',