diff --git a/jest.config.mjs b/jest.config.mjs index d9fc678189..dd2e9f3146 100644 --- a/jest.config.mjs +++ b/jest.config.mjs @@ -36,6 +36,9 @@ export default { }, testEnvironment: 'node', testPathIgnorePatterns: ignorePatterns, + // Default 5s timeout often fails on Windows :s, + // see https://github.com/facebook/docusaurus/pull/8259 + testTimeout: 15000, coveragePathIgnorePatterns: [ ...ignorePatterns, // We also ignore all package entry points diff --git a/packages/docusaurus-logger/src/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-logger/src/__tests__/__snapshots__/index.test.ts.snap index 5980bd3de2..f90699ec75 100644 --- a/packages/docusaurus-logger/src/__tests__/__snapshots__/index.test.ts.snap +++ b/packages/docusaurus-logger/src/__tests__/__snapshots__/index.test.ts.snap @@ -12,7 +12,7 @@ exports[`error prints objects 1`] = ` "[ERROR] 1,2,3", ], [ - "[ERROR] Sat Nov 13 2021 00:00:00 GMT+0000 (Coordinated Universal Time)", + "[ERROR] Sat, 13 Nov 2021 00:00:00 GMT", ], ] `; @@ -29,7 +29,7 @@ exports[`info prints objects 1`] = ` "[INFO] 1,2,3", ], [ - "[INFO] Sat Nov 13 2021 00:00:00 GMT+0000 (Coordinated Universal Time)", + "[INFO] Sat, 13 Nov 2021 00:00:00 GMT", ], ] `; @@ -46,7 +46,7 @@ exports[`success prints objects 1`] = ` "[SUCCESS] 1,2,3", ], [ - "[SUCCESS] Sat Nov 13 2021 00:00:00 GMT+0000 (Coordinated Universal Time)", + "[SUCCESS] Sat, 13 Nov 2021 00:00:00 GMT", ], ] `; @@ -63,7 +63,7 @@ exports[`warn prints objects 1`] = ` "[WARNING] 1,2,3", ], [ - "[WARNING] Sat Nov 13 2021 00:00:00 GMT+0000 (Coordinated Universal Time)", + "[WARNING] Sat, 13 Nov 2021 00:00:00 GMT", ], ] `; diff --git a/packages/docusaurus-logger/src/index.ts b/packages/docusaurus-logger/src/index.ts index 3de5f81c03..23a6220e38 100644 --- a/packages/docusaurus-logger/src/index.ts +++ b/packages/docusaurus-logger/src/index.ts @@ -60,6 +60,9 @@ function stringify(msg: unknown): string { if (String(msg) === '[object Object]') { return JSON.stringify(msg); } + if (msg instanceof Date) { + return msg.toUTCString(); + } return String(msg); } diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts index 39a762f714..f0971546e5 100644 --- a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts +++ b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts @@ -34,8 +34,6 @@ import type { import type {LoadContext} from '@docusaurus/types'; import type {Optional} from 'utility-types'; -jest.setTimeout(15000); - const fixtureDir = path.join(__dirname, '__fixtures__'); const createFakeDocFile = ({ diff --git a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts index 446a1ea9d0..b05190f16e 100644 --- a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts +++ b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts @@ -5,15 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -import {jest} from '@jest/globals'; import path from 'path'; import fs from 'fs-extra'; import _ from 'lodash'; import {extractThemeCodeMessages} from '../../src/utils'; -// Seems the 5s default timeout fails sometimes -jest.setTimeout(15000); - describe('theme translations', () => { it('has base messages files contain EXACTLY all the translations extracted from the theme. Please run "yarn workspace @docusaurus/theme-translations update" to keep base messages files up-to-date', async () => { const baseMessagesDirPath = path.join(__dirname, '../base');