explicitly import @jest/globals and mocha (#57786)

Previously bindings like `expect`, `describe`, `afterAll`, etc., were imported implicitly by Jest or Mocha. We should import them explicitly to reduce magic. (Also this makes it easier to migrate to another test runner in the future if we want.)

client/branded/BUILD.bazel

@@ -5,6 +5,7 @@ load("//dev:eslint.bzl", "eslint_config_and_lint_root", "eslint_test_with_types"
 
 # TODO(bazel): storybook build
 # gazelle:exclude **/*.story.{ts,tsx}
+# gazelle:exclude **/testGlobals.d.ts
 
 # gazelle:js_resolve **/*.module.scss :module_style_typings
 
@@ -250,6 +251,7 @@ ts_project(
         "src/search-ui/results/sidebar/SearchFilterSection.test.tsx",
         "src/search-ui/results/sidebar/helpers.test.ts",
         "src/search-ui/results/use-items-to-show.test.ts",
+        "src/testGlobals.d.ts",  #keep
     ],
     tsconfig = ":tsconfig",
     deps = [
@@ -260,6 +262,8 @@ ts_project(
         ":node_modules/@sourcegraph/wildcard",
         "//:node_modules/@codemirror/autocomplete",
         "//:node_modules/@codemirror/state",
+        "//:node_modules/@jest/globals",
+        "//:node_modules/@testing-library/jest-dom",  #keep
         "//:node_modules/@testing-library/react",
         "//:node_modules/@testing-library/user-event",
         "//:node_modules/@types/history",

client/branded/src/components/Timestamp/Timestamp.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { render } from '@testing-library/react'
 
 import { Timestamp, TimestampFormat } from './Timestamp'

client/branded/src/components/Toggle.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'

client/branded/src/components/ToggleBig.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'

client/branded/src/components/panel/TabbedPanelContent.test.tsx

@@ -1,5 +1,6 @@
 import React from 'react'
 
+import { afterEach, describe, expect, it } from '@jest/globals'
 import { cleanup, fireEvent } from '@testing-library/react'
 
 import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing'

client/branded/src/components/panel/views/locations.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import type { Location } from '@sourcegraph/extension-api-types'
 
 import { type GroupedLocations, groupLocations } from './locations'

client/branded/src/search-ui/components/CodeExcerpt.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, describe, expect, it } from '@jest/globals'
 import { cleanup, getByText, render } from '@testing-library/react'
 import { of } from 'rxjs'
 import { map } from 'rxjs/operators'

client/branded/src/search-ui/components/FileContentSearchResult.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, describe, expect, it } from '@jest/globals'
 import { cleanup, getAllByTestId, getByTestId } from '@testing-library/react'
 import { createBrowserHistory } from 'history'
 import FileIcon from 'mdi-react/FileIcon'

client/branded/src/search-ui/components/FileMatchChildren.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, describe, it } from '@jest/globals'
 import { cleanup } from '@testing-library/react'
 import * as H from 'history'
 import { of } from 'rxjs'

client/branded/src/search-ui/components/LegacyResultContainer.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, describe, expect, it } from '@jest/globals'
 import { cleanup, fireEvent, getByTestId, getByText } from '@testing-library/react'
 import * as H from 'history'
 import FileIcon from 'mdi-react/FileIcon'

client/branded/src/search-ui/components/RepoFileLink.test.tsx

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing'
 
 import { RepoFileLink } from './RepoFileLink'

client/branded/src/search-ui/components/SyntaxHighlightedSearchQuery.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { render } from '@testing-library/react'
 
 import { SyntaxHighlightedSearchQuery } from './SyntaxHighlightedSearchQuery'

client/branded/src/search-ui/input/LazyQueryInput.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { render } from '@testing-library/react'
 import { noop } from 'lodash'
 

client/branded/src/search-ui/input/SearchContextDropdown.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from '@jest/globals'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { act } from 'react-dom/test-utils'

client/branded/src/search-ui/input/SearchContextMenu.test.tsx

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from '@jest/globals'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { act } from 'react-dom/test-utils'

client/branded/src/search-ui/input/codemirror/completion.test.ts

@@ -1,4 +1,5 @@
 import type { Completion } from '@codemirror/autocomplete'
+import { describe, expect, test } from '@jest/globals'
 
 import { SymbolKind } from '@sourcegraph/shared/src/graphql-operations'
 import { POPULAR_LANGUAGES } from '@sourcegraph/shared/src/search/query/languageFilter'

client/branded/src/search-ui/input/experimental/codemirror/searchcontext.test.ts

@@ -1,4 +1,5 @@
 import { EditorState } from '@codemirror/state'
+import { describe, expect, it } from '@jest/globals'
 
 import { SearchPatternType } from '@sourcegraph/shared/src/graphql-operations'
 

client/branded/src/search-ui/input/experimental/utils.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { shortenPath } from './utils'
 
 describe('shortenPath', () => {

client/branded/src/search-ui/input/toggles/Toggles.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { screen } from '@testing-library/react'
 
 import { SearchPatternType } from '@sourcegraph/shared/src/graphql-operations'

client/branded/src/search-ui/results/progress/StreamingProgressCount.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { render } from '@testing-library/react'
 
 import type { Progress } from '@sourcegraph/shared/src/search/stream'

client/branded/src/search-ui/results/progress/StreamingProgressSkippedButton.test.tsx

@@ -1,3 +1,4 @@
+import { beforeAll, describe, expect, it } from '@jest/globals'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'

client/branded/src/search-ui/results/progress/StreamingProgressSkippedPopover.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { screen, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'

client/branded/src/search-ui/results/progress/exhaustive-search/exhaustive-search-validation.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { validateQueryForExhaustiveSearch } from './exhaustive-search-validation'
 
 describe('exhaustive search validation', () => {

client/branded/src/search-ui/results/sidebar/FilterLink.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'

client/branded/src/search-ui/results/sidebar/QuickLink.test.tsx

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import type { QuickLink } from '@sourcegraph/shared/src/schema/settings.schema'
 import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing'
 

client/branded/src/search-ui/results/sidebar/SearchFilterSection.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { stub } from 'sinon'

client/branded/src/search-ui/results/sidebar/helpers.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { renderHook } from '@testing-library/react'
 
 import { FilterType } from '@sourcegraph/shared/src/search/query/filters'

client/branded/src/search-ui/results/use-items-to-show.test.ts

@@ -1,3 +1,4 @@
+import { afterEach, describe, expect, it } from '@jest/globals'
 import { act, renderHook } from '@testing-library/react'
 import { times } from 'lodash'
 
@@ -11,7 +12,7 @@ function renderUseItemsToShowHook(query = 'Hello there!') {
 
 function scrollToViewMoreResults(scrollNumber: number, handleBottomHit: () => void) {
     // Do not await `act` call with sync logic. It's not a promise.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+
     act(() => {
         times(scrollNumber, handleBottomHit)
     })

client/branded/src/testGlobals.d.ts

@@ -0,0 +1 @@
+/// <reference types="@testing-library/jest-dom/types/jest-globals" />

client/browser/BUILD.bazel

@@ -11,6 +11,7 @@ load("//dev:eslint.bzl", "eslint_config_and_lint_root", "eslint_test_with_types"
 
 # TODO(bazel): storybook build
 # gazelle:exclude **/*.story.{ts,tsx}
+# gazelle:exclude **/testGlobals.d.ts
 
 # gazelle:js_resolve **/*.module.scss :module_style_typings
 
@@ -247,12 +248,12 @@ ts_project(
         ":node_modules/@sourcegraph/http-client",
         ":node_modules/@sourcegraph/shared",
         ":node_modules/@sourcegraph/wildcard",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@mdi/js",
         "//:node_modules/@reach/combobox",
         "//:node_modules/@sentry/browser",
         "//:node_modules/@types/classnames",
         "//:node_modules/@types/history",
-        "//:node_modules/@types/jest",  #keep
         "//:node_modules/@types/lodash",
         "//:node_modules/@types/mz",
         "//:node_modules/@types/node",
@@ -303,6 +304,7 @@ ts_project(
         "src/shared/code-hosts/shared/codeViews.test.ts",
         "src/shared/code-hosts/shared/views.test.ts",
         "src/shared/code-hosts/sourcegraph/inject.test.tsx",
+        "src/testGlobals.d.ts",  #keep
     ],
     tsconfig = ":tsconfig",
     deps = [
@@ -313,6 +315,8 @@ ts_project(
         ":node_modules/@sourcegraph/shared",
         ":node_modules/@sourcegraph/wildcard",  #keep
         ":node_modules/sourcegraph",
+        "//:node_modules/@jest/globals",
+        "//:node_modules/@testing-library/jest-dom",  #keep
         "//:node_modules/@testing-library/react",
         "//:node_modules/@types/lodash",
         "//:node_modules/@types/mz",
@@ -330,9 +334,22 @@ ts_project(
     ],
 )
 
+js_library(
+    name = "jest_config",
+    testonly = True,
+    srcs = [
+        "jest.config.js",
+    ],
+    data = [
+        "src/shared/jestSetupAfterEnv.js",
+    ],
+    deps = ["//:jest_config"],
+)
+
 jest_test(
     name = "test",
     timeout = "moderate",
+    config = ":jest_config",
     data = [
         ":browser_tests",
     ],

client/browser/jest.config.js

@@ -4,4 +4,11 @@
 const config = require('../../jest.config.base')
 
 /** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = { ...config, displayName: 'browser', rootDir: __dirname }
+module.exports = {
+  ...config,
+  displayName: 'browser',
+  rootDir: __dirname,
+  roots: ['<rootDir>/src'],
+  modulePathIgnorePatterns: ['<rootDir>/.*runfiles.*', '.*/end-to-end/.*'], // TODO(sqs)
+  setupFilesAfterEnv: [...(config.setupFilesAfterEnv || []), '<rootDir>/src/shared/jestSetupAfterEnv.js'],
+}

client/browser/src/end-to-end/BUILD.bazel

@@ -20,9 +20,11 @@ ts_project(
     srcs = ["shared.ts"],
     tsconfig = ":tsconfig",
     deps = [
+        "//:node_modules/@types/mocha",
         "//:node_modules/@types/node",
         "//:node_modules/@types/puppeteer",
         "//:node_modules/expect",
+        "//:node_modules/mocha",
         "//:node_modules/puppeteer",
         "//client/browser:node_modules/@sourcegraph/shared",
     ],
@@ -42,10 +44,12 @@ ts_project(
     deps = [
         ":end-to-end",
         "//:node_modules/@types/lodash",
+        "//:node_modules/@types/mocha",
         "//:node_modules/@types/node",
         "//:node_modules/@types/puppeteer",
         "//:node_modules/expect",
         "//:node_modules/lodash",
+        "//:node_modules/mocha",
         "//:node_modules/puppeteer",
         "//:node_modules/rxjs",
         "//client/browser",

client/browser/src/end-to-end/bitbucket.test.ts

@@ -1,4 +1,5 @@
 import expect from 'expect'
+import { describe } from 'mocha'
 
 import { ExternalServiceKind } from '@sourcegraph/shared/src/graphql-operations'
 import { getConfig } from '@sourcegraph/shared/src/testing/config'

client/browser/src/end-to-end/github.test.ts

@@ -1,6 +1,7 @@
 import assert from 'assert'
 
 import { startCase } from 'lodash'
+import { describe, it } from 'mocha'
 import type { Target, Page } from 'puppeteer'
 import { fromEvent } from 'rxjs'
 import { first, filter, timeout, mergeMap } from 'rxjs/operators'

client/browser/src/end-to-end/gitlab.test.ts

@@ -1,3 +1,5 @@
+import { describe } from 'mocha'
+
 import { ExternalServiceKind } from '@sourcegraph/shared/src/graphql-operations'
 import { getConfig } from '@sourcegraph/shared/src/testing/config'
 import { createDriverForTest, type Driver } from '@sourcegraph/shared/src/testing/driver'

client/browser/src/end-to-end/phabricator.test.ts

@@ -1,5 +1,6 @@
 import expect from 'expect'
 import { isEqual } from 'lodash'
+import { describe, it } from 'mocha'
 
 import { ExternalServiceKind } from '@sourcegraph/shared/src/graphql-operations'
 import { getConfig } from '@sourcegraph/shared/src/testing/config'

client/browser/src/end-to-end/shared.ts

@@ -1,6 +1,7 @@
 import assert from 'assert'
 
 import expect from 'expect'
+import { describe, it } from 'mocha'
 import type puppeteer from 'puppeteer'
 
 import type { Driver } from '@sourcegraph/shared/src/testing/driver'

client/browser/src/end-to-end/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "references": [{ "path": "../.." }, { "path": "../../../shared/src/testing" }],
   "compilerOptions": {
-    "types": ["mocha", "node"],
+    "types": ["node"],
     "module": "commonjs",
     "rootDir": ".",
     "outDir": "../../out/src/end-to-end",

client/browser/src/integration/github.test.ts

@@ -1,5 +1,7 @@
 import assert from 'assert'
 
+import { afterEach, beforeEach, describe, it } from 'mocha'
+
 import type { ExtensionContext } from '@sourcegraph/shared/src/codeintel/legacy-extensions/api'
 import type { Settings } from '@sourcegraph/shared/src/settings/settings'
 import { createDriverForTest, type Driver } from '@sourcegraph/shared/src/testing/driver'

client/browser/src/integration/gitlab.test.ts

@@ -1,5 +1,7 @@
 import assert from 'assert'
 
+import { afterEach, beforeEach, describe, it } from 'mocha'
+
 import type { Settings } from '@sourcegraph/shared/src/settings/settings'
 import { createDriverForTest, type Driver } from '@sourcegraph/shared/src/testing/driver'
 import { setupExtensionMocking, simpleHoverProvider } from '@sourcegraph/shared/src/testing/integration/mockExtension'

client/browser/src/integration/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "references": [{ "path": "../.." }, { "path": "../../../shared/src/testing" }],
   "compilerOptions": {
-    "types": ["mocha", "node"],
+    "types": ["node"],
     "module": "commonjs",
     "rootDir": ".",
     "outDir": "../../out/src/integration",

client/browser/src/shared/code-hosts/bitbucket-cloud/codeHost.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import type { LineOrPositionOrRange } from '@sourcegraph/common'
 
 import { parseHash } from './codeHost'

client/browser/src/shared/code-hosts/bitbucket/codeHost.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import type { LineOrPositionOrRange } from '@sourcegraph/common'
 
 import { testCodeHostMountGetters, testToolbarMountGetter } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/bitbucket/domFunctions.test.tsx

@@ -1,3 +1,4 @@
+import { describe } from '@jest/globals'
 import { startCase } from 'lodash'
 
 import { testDOMFunctions } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/bitbucket/scrape.test.ts

@@ -1,3 +1,4 @@
+import { afterEach, describe, expect, it } from '@jest/globals'
 import { readFile } from 'mz/fs'
 
 import { getFixtureBody } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/github/codeHost.test.ts

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync } from 'fs'
 
+import { afterAll, beforeAll, beforeEach, describe, expect, it, test } from '@jest/globals'
 import fetch from 'jest-fetch-mock'
 import { startCase } from 'lodash'
 import { readFile } from 'mz/fs'
@@ -225,7 +226,7 @@ describe('isPrivateRepository', () => {
 
         beforeEach(() => {
             fetch.enableMocks()
-            fetch.mockClear()
+            fetch.resetMocks()
         })
 
         afterAll(() => {

client/browser/src/shared/code-hosts/github/domFunctions.test.tsx

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { startCase } from 'lodash'
 import type { Omit } from 'utility-types'
 

client/browser/src/shared/code-hosts/github/fileInfo.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { readFile } from 'mz/fs'
 
 import { getFilePath, getFilePathFromURL } from './util'

client/browser/src/shared/code-hosts/github/util.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { startCase } from 'lodash'
 
 import { getFixtureBody } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/gitlab/codeHost.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, beforeEach, describe, expect, it, test } from '@jest/globals'
 import fetch from 'jest-fetch-mock'
 import { readFile } from 'mz/fs'
 
@@ -161,7 +162,7 @@ describe('isPrivateRepository', () => {
         })
 
         beforeEach(() => {
-            fetch.mockClear()
+            fetch.resetMocks()
         })
 
         afterAll(() => {

client/browser/src/shared/code-hosts/gitlab/domFunctions.test.tsx

@@ -1,3 +1,4 @@
+import { describe } from '@jest/globals'
 import { startCase } from 'lodash'
 
 import { testDOMFunctions } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/gitlab/scrape.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { getPageKindFromPathName, GitLabPageKind } from './scrape'
 
 describe('getPageKindFromPathName()', () => {

client/browser/src/shared/code-hosts/phabricator/codeHost.test.ts

@@ -1,3 +1,5 @@
+import { describe } from '@jest/globals'
+
 import { testToolbarMountGetter } from '../shared/codeHostTestUtils'
 
 import { commitCodeView, diffCodeView } from './codeHost'

client/browser/src/shared/code-hosts/phabricator/domFunctions.test.tsx

@@ -1,3 +1,4 @@
+import { describe } from '@jest/globals'
 import { startCase } from 'lodash'
 
 import { type DOMFunctionsTest, testDOMFunctions } from '../shared/codeHostTestUtils'

client/browser/src/shared/code-hosts/phabricator/fileInfo.test.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, test } from '@jest/globals'
 import { readFile } from 'mz/fs'
 import { type Observable, throwError, of } from 'rxjs'
 

client/browser/src/shared/code-hosts/shared/ViewOnSourcegraphButton.test.tsx

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { render } from '@testing-library/react'
 import { noop } from 'lodash'
 

client/browser/src/shared/code-hosts/shared/codeHost.test.tsx

@@ -1,6 +1,7 @@
 import { nextTick } from 'process'
 import { promisify } from 'util'
 
+import { afterEach, beforeAll, beforeEach, jest, describe, expect, it, test } from '@jest/globals'
 import type { RenderResult } from '@testing-library/react'
 import type { Remote } from 'comlink'
 import { uniqueId, noop, pick } from 'lodash'

client/browser/src/shared/code-hosts/shared/codeHostTestUtils.ts

@@ -1,5 +1,6 @@
 import assert from 'assert'
 
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { readFile } from 'mz/fs'
 import Simmer, { type Options as SimmerOptions } from 'simmerjs'
 import type { SetIntersection } from 'utility-types'
@@ -75,7 +76,7 @@ export async function getFixtureBody({
  * @param mayReturnNull Whether the mount getter might be called with containers where the mount does not belong.
  * It will be tested to return `null` in that case.
  */
-export function testMountGetter(
+function testMountGetter(
     htmlFixturePath: string,
     getMount: MountGetter,
     isFullDocument: boolean,

client/browser/src/shared/code-hosts/shared/codeViews.test.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { of } from 'rxjs'
 import { toArray } from 'rxjs/operators'
 import * as sinon from 'sinon'

client/browser/src/shared/code-hosts/shared/views.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeEach, describe, expect, test } from '@jest/globals'
 import { noop } from 'lodash'
 import { from, type Observable, of, Subject, Subscription, NEVER } from 'rxjs'
 import { bufferCount, map, switchMap, toArray } from 'rxjs/operators'

client/browser/src/shared/code-hosts/sourcegraph/inject.test.tsx

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { checkIsSourcegraph } from './inject'
 
 describe('checkIsSourcegraph()', () => {

client/browser/src/shared/jestSetupAfterEnv.js

@@ -0,0 +1,4 @@
+// jest-fetch-mock assumes the `jest` global is available, but we use explicit imports from
+// `@jest/globals`. This is a workaround to make jest-fetch-mock work. See
+// https://github.com/jefflau/jest-fetch-mock/issues/104.
+global.jest = require('@jest/globals').jest

client/browser/src/testGlobals.d.ts

@@ -0,0 +1 @@
+/// <reference types="@testing-library/jest-dom/types/jest-globals" />

client/client-api/BUILD.bazel

@@ -46,6 +46,7 @@ ts_project(
     deps = [
         ":client-api_lib",
         ":node_modules/@sourcegraph/extension-api-types",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@sourcegraph/extension-api-classes",
     ],
 )

client/client-api/src/hover.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { MarkupKind } from '@sourcegraph/extension-api-classes'
 import type { Range } from '@sourcegraph/extension-api-types'
 

client/codeintellify/BUILD.bazel

@@ -56,6 +56,7 @@ ts_project(
         "src/testutils/fixtures.ts",
         "src/testutils/generate.ts",
         "src/testutils/github/generate.ts",
+        "src/testutils/globals.d.ts",
         "src/testutils/mouse.ts",
         "src/testutils/revision.ts",
         "src/testutils/sourcegraph/generate.ts",
@@ -71,6 +72,8 @@ ts_project(
         ":codeintellify_lib",
         ":node_modules/@sourcegraph/common",
         ":node_modules/@sourcegraph/extension-api-types",
+        "//:node_modules/@jest/globals",
+        "//:node_modules/@testing-library/jest-dom",  #keep
         "//:node_modules/@types/lodash",
         "//:node_modules/@types/node",
         "//:node_modules/lodash",

client/codeintellify/src/hoverifier.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, afterEach, beforeAll, describe, it, expect } from '@jest/globals'
 import { isEqual } from 'lodash'
 import { EMPTY, NEVER, of, Subject, Subscription } from 'rxjs'
 import { delay, distinctUntilChanged, filter, first, map, takeWhile } from 'rxjs/operators'

client/codeintellify/src/loading.test.ts

@@ -1,5 +1,6 @@
 import assert from 'assert'
 
+import { describe, it } from '@jest/globals'
 import { TestScheduler } from 'rxjs/testing'
 
 import { emitLoading, LOADING, type MaybeLoadingResult } from './loading'

client/codeintellify/src/overlayPosition.test.ts

@@ -1,5 +1,7 @@
 import * as assert from 'assert'
 
+import { describe, it } from '@jest/globals'
+
 import { calculateOverlayPosition, type HasGetBoundingClientRect } from './overlayPosition'
 
 const rectangle = (left: number, top: number, width: number, height: number): HasGetBoundingClientRect => ({

client/codeintellify/src/positions.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, describe, expect, it } from '@jest/globals'
 import { of } from 'rxjs'
 
 import { findPositionsFromEvents } from './positions'

client/codeintellify/src/testutils/dom.test.ts

@@ -1,3 +1,5 @@
+import { afterAll, describe, expect, it } from '@jest/globals'
+
 import { DOM } from './dom'
 
 describe('can create dom elements from generated code tables', () => {

client/codeintellify/src/testutils/globals.d.ts

@@ -0,0 +1 @@
+/// <reference types="@testing-library/jest-dom/types/jest-globals" />

client/codeintellify/src/tokenPosition.test.ts

@@ -1,5 +1,7 @@
 import * as assert from 'assert'
 
+import { afterAll, beforeAll, describe, expect, it } from '@jest/globals'
+
 import type { Position, Range } from '@sourcegraph/extension-api-types'
 
 import { type CodeViewProps, DOM } from './testutils/dom'

client/common/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
+load("@aspect_rules_js//js:defs.bzl", "js_library")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//dev:defs.bzl", "jest_test", "npm_package", "ts_project")
 load("//dev:eslint.bzl", "eslint_config_and_lint_root")
@@ -94,6 +95,7 @@ ts_project(
     tsconfig = ":tsconfig",
     deps = [
         ":common_lib",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@types/mockdate",
         "//:node_modules/@types/node",
         "//:node_modules/jest-fetch-mock",
@@ -110,8 +112,21 @@ npm_package(
     ],
 )
 
+js_library(
+    name = "jest_config",
+    testonly = True,
+    srcs = [
+        "jest.config.js",
+    ],
+    data = [
+        "src/jestSetupAfterEnv.js",
+    ],
+    deps = ["//:jest_config"],
+)
+
 jest_test(
     name = "test",
+    config = ":jest_config",
     data = [
         ":common_tests",
     ],

client/common/jest.config.js

@@ -6,8 +6,9 @@ const exportedConfig = {
   ...config,
   displayName: 'common',
   rootDir: __dirname,
-  roots: ['<rootDir>'],
+  roots: ['<rootDir>/src'],
   verbose: true,
+  setupFilesAfterEnv: [...(config.setupFilesAfterEnv || []), '<rootDir>/src/jestSetupAfterEnv.js'],
 }
 
 module.exports = exportedConfig

client/common/src/errors/errors.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { asError } from './errors'
 import { isErrorLike } from './utils'
 

client/common/src/jestSetupAfterEnv.js

@@ -0,0 +1,4 @@
+// jest-fetch-mock assumes the `jest` global is available, but we use explicit imports from
+// `@jest/globals`. This is a workaround to make jest-fetch-mock work. See
+// https://github.com/jefflau/jest-fetch-mock/issues/104.
+global.jest = require('@jest/globals').jest

client/common/src/util/fetchCache.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals'
 import fetch from 'jest-fetch-mock'
 import MockDate from 'mockdate'
 
@@ -19,7 +20,7 @@ describe('fetchCache', () => {
     })
 
     beforeEach(() => {
-        fetch.mockClear()
+        fetch.resetMocks()
         clearFetchCache()
         fetch.mockResponse(JSON.stringify(EXPECTED_DATA))
     })
@@ -65,7 +66,7 @@ describe('fetchCache', () => {
 
     it('makes multiple requests in case of cache expiration', async () => {
         const responseOne = await fetchCache({ cacheMaxAge: 1, url: TEST_URL })
-        await new Promise(resolve => setTimeout(resolve, 3)) // 3 millis passed
+        MockDate.set(Date.now() + 3)
         const responseTwo = await fetchCache({ cacheMaxAge: 1, url: TEST_URL })
 
         expectResponses([responseOne, responseTwo])

client/common/src/util/hashCode.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { hashCode } from './hashCode'
 
 describe('hashCode', () => {

client/common/src/util/highlightNode.test.ts

@@ -1,3 +1,5 @@
+import { beforeEach, describe, expect, test } from '@jest/globals'
+
 import * as dom from './highlightNode'
 
 describe('util/dom', () => {

client/common/src/util/jsonc.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { isErrorLike } from '../errors'
 
 import { modify, parseJSONCOrError } from './jsonc'

client/common/src/util/markdown/markdown.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it, test } from '@jest/globals'
+
 import { renderMarkdown, registerHighlightContributions, escapeMarkdown } from '.'
 
 registerHighlightContributions()

client/common/src/util/rxjs/asObservable.test.ts

@@ -1,5 +1,6 @@
 import assert from 'assert'
 
+import { describe, it } from '@jest/globals'
 import { of } from 'rxjs'
 
 import { asObservable } from './asObservable'

client/common/src/util/rxjs/combineLatestOrDefault.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, test } from '@jest/globals'
 import { of } from 'rxjs'
 import { TestScheduler } from 'rxjs/testing'
 

client/common/src/util/rxjs/repeatUntil.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { from, defer } from 'rxjs'
 import { TestScheduler } from 'rxjs/testing'
 

client/common/src/util/string.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { dedupeWhitespace } from './strings'
 
 describe('utils/string', () => {

client/common/src/util/url.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it, test } from '@jest/globals'
+
 import { lprToSelectionsZeroIndexed, encodeURIPathComponent, appendLineRangeQueryParameter } from './url'
 
 /**

client/http-client/BUILD.bazel

@@ -58,6 +58,7 @@ ts_project(
     deps = [
         ":http-client_lib",
         "//:node_modules/@apollo/client",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@types/sinon",
         "//:node_modules/delay",
         "//:node_modules/rxjs",

client/http-client/src/graphql/apollo/fromObservableQuery.test.ts

@@ -1,4 +1,5 @@
 import { Observable as ZenObservable, type ObservableQuery } from '@apollo/client'
+import { describe, expect, it } from '@jest/globals'
 import delay from 'delay'
 import { isObservable } from 'rxjs'
 import sinon from 'sinon'

client/http-client/src/graphql/graphql.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, test } from '@jest/globals'
+
 import { GRAPHQL_URI } from './constants'
 import { buildGraphQLUrl, gql } from './graphql'
 
@@ -53,7 +55,7 @@ describe('buildGraphQLUrl', () => {
         ],
     ]
 
-    test.each(testCases)('correctly constructs %s', (title, request, baseUrl, expectedResult) => {
+    test.each(testCases)('correctly constructs %s', (_title, request, baseUrl, expectedResult) => {
         expect(buildGraphQLUrl({ request, baseUrl })).toEqual(expectedResult)
     })
 })

client/observability-client/BUILD.bazel

@@ -83,7 +83,10 @@ ts_project(
     testonly = True,
     srcs = ["src/sdk/__tests__/getTracingUrl.test.ts"],
     tsconfig = ":tsconfig",
-    deps = [":observability-client_lib"],
+    deps = [
+        ":observability-client_lib",
+        "//:node_modules/@jest/globals",
+    ],
 )
 
 jest_test(

client/observability-client/src/sdk/__tests__/getTracingUrl.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { getTracingURL, TRACING_URL_SUFFIX } from '../getTracingUrl'
 
 const BASE_URL = 'https://sourcegraph.test:3443'

client/observability-server/BUILD.bazel

@@ -52,6 +52,7 @@ ts_project(
     tsconfig = ":tsconfig",
     deps = [
         ":observability-server",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@types/node",
     ],
 )

client/observability-server/src/webBundleSize/getBundleSizeStats.test.ts

@@ -1,5 +1,7 @@
 import path from 'path'
 
+import { describe, expect, it, jest } from '@jest/globals'
+
 import { getBundleSizeStats } from './getBundleSizeStats'
 
 const MOCK_ASSETS_PATH = path.join(__dirname, './__mocks__/assets')

client/shared/BUILD.bazel

@@ -9,6 +9,7 @@ load("//dev:eslint.bzl", "eslint_config_and_lint_root", "eslint_test_with_types"
 
 # TODO(bazel): storybook build
 # gazelle:exclude **/*.story.{ts,tsx}
+# gazelle:exclude **/testGlobals.d.ts
 
 # gazelle:js_resolve **/*.module.scss :module_style_typings
 # gazelle:js_resolve ../graphql-operations //client/shared:graphql_operations
@@ -463,6 +464,7 @@ ts_project(
         "src/search/query/validate.test.ts",
         "src/settings/settings.test.ts",
         "src/settings/temporary/useTemporarySetting.test.tsx",
+        "src/testGlobals.d.ts",  #keep
         "src/tracking/utm.test.ts",
         "src/util/dom.test.ts",
         "src/util/url.test.ts",
@@ -482,8 +484,10 @@ ts_project(
         ":node_modules/sourcegraph",
         ":shared_lib",
         "//:node_modules/@apollo/client",
+        "//:node_modules/@jest/globals",
         "//:node_modules/@sourcegraph/extension-api-classes",
         "//:node_modules/@sourcegraph/extension-api-stubs",
+        "//:node_modules/@testing-library/jest-dom",  #keep
         "//:node_modules/@testing-library/react",
         "//:node_modules/@testing-library/user-event",
         "//:node_modules/@types/history",

client/shared/dev/BUILD.bazel

@@ -79,11 +79,13 @@ ts_project(
     tsconfig = "//client/shared:tsconfig",
     visibility = ["//visibility:private"],
     deps = [
+        "//:node_modules/@jest/globals",
         "//:node_modules/@sentry/browser",
         "//:node_modules/@testing-library/react",
-        "//:node_modules/@types/jest",
+        "//:node_modules/@types/lodash",
         "//:node_modules/@types/node",
         "//:node_modules/@types/react",
+        "//:node_modules/lodash",
         "//:node_modules/react",
         "//:node_modules/react-visibility-sensor",
         "//:node_modules/resize-observer-polyfill",

client/shared/dev/mockMatchMedia.ts

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals'
+
 /* eslint-disable ban/ban */
 
 /**

client/shared/dev/mockResizeObserver.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import ResizeObserver from 'resize-observer-polyfill'
 
 if ('ResizeObserver' in window === false) {
@@ -6,6 +7,6 @@ if ('ResizeObserver' in window === false) {
 
 jest.mock('use-resize-observer', () => ({
     __esModule: true,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
     default: jest.requireActual('use-resize-observer/polyfilled'),
 }))

client/shared/dev/mockUniqueId.ts

@@ -1,8 +1,10 @@
+import { jest } from '@jest/globals'
+
 // The value returned by the `_.uniqueId()` function depends on the number of previous calls
 // because it maintains an internal variable that increments on each call.
 // Mock `_.uniqueId()` to avoid updating snapshots once the sequence or number of tests using this helper changes.
 jest.mock('lodash', () =>
-    Object.assign(jest.requireActual('lodash'), {
+    Object.assign(jest.requireActual<typeof import('lodash')>('lodash'), {
         // Keep all actual implementations except uniqueId
         uniqueId: (prefix = '') => `${prefix}test-id`,
     })

client/shared/dev/reactCleanup.ts

@@ -1,3 +1,4 @@
+import { afterEach } from '@jest/globals'
 import { cleanup } from '@testing-library/react'
 
 /**