From 8e594b6a95dd167c8a1c41f4c32dbfba91604b7a Mon Sep 17 00:00:00 2001 From: Tom Mrazauskas Date: Fri, 7 Oct 2022 12:51:09 +0300 Subject: [PATCH 1/2] fix(@jest/reporters): do not transform file paths into hyperlinks --- packages/jest-reporters/package.json | 1 - .../src/__tests__/getResultHeader.test.js | 23 ------------------- .../jest-reporters/src/getResultHeader.ts | 15 ++++-------- yarn.lock | 21 ----------------- 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index f821cf9d347a..eb96892f1eb9 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -35,7 +35,6 @@ "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "devDependencies": { diff --git a/packages/jest-reporters/src/__tests__/getResultHeader.test.js b/packages/jest-reporters/src/__tests__/getResultHeader.test.js index 9c7efb001d67..19b1444eb8c5 100644 --- a/packages/jest-reporters/src/__tests__/getResultHeader.test.js +++ b/packages/jest-reporters/src/__tests__/getResultHeader.test.js @@ -7,9 +7,6 @@ import {makeGlobalConfig} from '@jest/test-utils'; import getResultHeader from '../getResultHeader'; -const terminalLink = require('terminal-link'); - -jest.mock('terminal-link', () => jest.fn(() => 'wannabehyperlink')); const endTime = 1577717671160; const testTime = 5500; @@ -38,26 +35,6 @@ const testResultFast = { const globalConfig = makeGlobalConfig(); -beforeEach(() => { - terminalLink.mockClear(); -}); - -test('should call `terminal-link` correctly', () => { - getResultHeader(testResult, globalConfig); - - expect(terminalLink).toHaveBeenCalledWith( - expect.stringContaining('foo'), - 'file:///foo', - expect.objectContaining({fallback: expect.any(Function)}), - ); -}); - -test('should render the terminal link', () => { - const result = getResultHeader(testResult, globalConfig); - - expect(result).toContain('wannabehyperlink'); -}); - test('should display test time for slow test', () => { const result = getResultHeader(testResultSlow, globalConfig); diff --git a/packages/jest-reporters/src/getResultHeader.ts b/packages/jest-reporters/src/getResultHeader.ts index 8f74f761fb0d..98315fdb4f78 100644 --- a/packages/jest-reporters/src/getResultHeader.ts +++ b/packages/jest-reporters/src/getResultHeader.ts @@ -6,7 +6,6 @@ */ import chalk = require('chalk'); -import terminalLink = require('terminal-link'); import type {TestResult} from '@jest/test-result'; import type {Config} from '@jest/types'; import {formatTime} from 'jest-util'; @@ -33,13 +32,6 @@ export default function getResultHeader( projectConfig?: Config.ProjectConfig, ): string { const testPath = result.testFilePath; - const formattedTestPath = formatTestPath( - projectConfig ? projectConfig : globalConfig, - testPath, - ); - const fileLink = terminalLink(formattedTestPath, `file://${testPath}`, { - fallback: () => formattedTestPath, - }); const status = result.numFailingTests > 0 || result.testExecError ? FAIL : PASS; @@ -61,7 +53,8 @@ export default function getResultHeader( ? `${printDisplayName(projectConfig)} ` : ''; - return `${status} ${projectDisplayName}${fileLink}${ - testDetail.length ? ` (${testDetail.join(', ')})` : '' - }`; + return `${status} ${projectDisplayName}${formatTestPath( + projectConfig ?? globalConfig, + testPath, + )}${testDetail.length ? ` (${testDetail.join(', ')})` : ''}`; } diff --git a/yarn.lock b/yarn.lock index d7989eca44f9..8887297a67cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2874,7 +2874,6 @@ __metadata: slash: ^3.0.0 string-length: ^4.0.1 strip-ansi: ^6.0.0 - terminal-link: ^2.0.0 tsd-lite: ^0.6.0 v8-to-istanbul: ^9.0.1 peerDependencies: @@ -19536,16 +19535,6 @@ __metadata: languageName: node linkType: hard -"supports-hyperlinks@npm:^2.0.0": - version: 2.2.0 - resolution: "supports-hyperlinks@npm:2.2.0" - dependencies: - has-flag: ^4.0.0 - supports-color: ^7.0.0 - checksum: aef04fb41f4a67f1bc128f7c3e88a81b6cf2794c800fccf137006efe5bafde281da3e42e72bf9206c2fcf42e6438f37e3a820a389214d0a88613ca1f2d36076a - languageName: node - linkType: hard - "supports-preserve-symlinks-flag@npm:^1.0.0": version: 1.0.0 resolution: "supports-preserve-symlinks-flag@npm:1.0.0" @@ -19708,16 +19697,6 @@ __metadata: languageName: node linkType: hard -"terminal-link@npm:^2.0.0": - version: 2.1.1 - resolution: "terminal-link@npm:2.1.1" - dependencies: - ansi-escapes: ^4.2.1 - supports-hyperlinks: ^2.0.0 - checksum: ce3d2cd3a438c4a9453947aa664581519173ea40e77e2534d08c088ee6dda449eabdbe0a76d2a516b8b73c33262fedd10d5270ccf7576ae316e3db170ce6562f - languageName: node - linkType: hard - "terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.3": version: 5.3.6 resolution: "terser-webpack-plugin@npm:5.3.6" From 95771a6a17ff6bcbcf2ef0e9d30a5e31c36507db Mon Sep 17 00:00:00 2001 From: Tom Mrazauskas Date: Fri, 7 Oct 2022 13:21:53 +0300 Subject: [PATCH 2/2] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30916146f9bb..bf234ab83e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Fixes - `[babel-plugin-jest-hoist]` Ignore `TSTypeQuery` when checking for hoisted references ([#13367](https://github.com/facebook/jest/pull/13367)) +- `[jest-reporters]` Revert: Transform file paths into hyperlinks ([#13399](https://github.com/facebook/jest/pull/13399)) - `[@jest/types]` Infer type of `each` table correctly when the table is a tuple or array ([#13381](https://github.com/facebook/jest/pull/13381)) - `[@jest/types]` Rework typings to allow the `*ReturnedWith` matchers to be called with no argument ([#13385](https://github.com/facebook/jest/pull/13385))