From ecb0a9b89ace05187b8110ed3653bb570107340b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <5417662+ftonato@users.noreply.github.com> Date: Sun, 16 May 2021 07:39:26 +0100 Subject: [PATCH] refactor: use nullish coalescing operator on getProjectDisplayName (#11410) --- packages/expect/src/utils.ts | 2 -- packages/jest-core/src/getProjectDisplayName.ts | 6 +----- packages/jest-fake-timers/src/legacyFakeTimers.ts | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/expect/src/utils.ts b/packages/expect/src/utils.ts index d59efca71fd3..858f7a7d03cb 100644 --- a/packages/expect/src/utils.ts +++ b/packages/expect/src/utils.ts @@ -350,9 +350,7 @@ export const partition = ( export const isError = (value: unknown): value is Error => { switch (Object.prototype.toString.call(value)) { case '[object Error]': - return true; case '[object Exception]': - return true; case '[object DOMException]': return true; default: diff --git a/packages/jest-core/src/getProjectDisplayName.ts b/packages/jest-core/src/getProjectDisplayName.ts index d9e8271c622a..b903c6e35ee8 100644 --- a/packages/jest-core/src/getProjectDisplayName.ts +++ b/packages/jest-core/src/getProjectDisplayName.ts @@ -10,9 +10,5 @@ import type {Config} from '@jest/types'; export default function getProjectDisplayName( projectConfig: Config.ProjectConfig, ): string | undefined { - const {displayName} = projectConfig; - if (!displayName) { - return undefined; - } - return displayName.name; + return projectConfig.displayName?.name || undefined; } diff --git a/packages/jest-fake-timers/src/legacyFakeTimers.ts b/packages/jest-fake-timers/src/legacyFakeTimers.ts index ab918f89b3c9..55d9121ed405 100644 --- a/packages/jest-fake-timers/src/legacyFakeTimers.ts +++ b/packages/jest-fake-timers/src/legacyFakeTimers.ts @@ -526,9 +526,8 @@ export default class FakeTimers { switch (timer.type) { case 'timeout': - const callback = timer.callback; this._timers.delete(timerHandle); - callback(); + timer.callback(); break; case 'interval':