diff --git a/.tool-versions b/.tool-versions index fc0043ece8e..42dc16f0d63 100644 --- a/.tool-versions +++ b/.tool-versions @@ -12,4 +12,4 @@ awscli 2.4.7 python 3.11.3 system rust 1.68.0 ruby 3.1.3 -pnpm 8.3.0 +pnpm 8.9.2 diff --git a/BUILD.bazel b/BUILD.bazel index 0349639d9dd..55301fd8ba9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -57,7 +57,7 @@ ts_config( ts_config( name = "tsconfig-all", - src = "tsconfig.all.json", + src = "tsconfig.json", visibility = ["//visibility:public"], deps = [ ":tsconfig", diff --git a/client/browser/BUILD.bazel b/client/browser/BUILD.bazel index b674a09fa80..00690d9c90c 100644 --- a/client/browser/BUILD.bazel +++ b/client/browser/BUILD.bazel @@ -313,6 +313,7 @@ ts_project( ":node_modules/@sourcegraph/common", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/shared", + ":node_modules/@sourcegraph/testing", ":node_modules/@sourcegraph/wildcard", #keep ":node_modules/sourcegraph", "//:node_modules/@jest/globals", diff --git a/client/browser/package.json b/client/browser/package.json index 2be1c4069d8..8ffb747b684 100644 --- a/client/browser/package.json +++ b/client/browser/package.json @@ -33,6 +33,7 @@ "devDependencies": { "@sourcegraph/build-config": "workspace:*", "@sourcegraph/extension-api-types": "workspace:*", + "@sourcegraph/testing": "workspace:*", "sourcegraph": "workspace:*" }, "dependencies": { diff --git a/client/browser/src/shared/code-hosts/bitbucket/scrape.test.ts b/client/browser/src/shared/code-hosts/bitbucket/scrape.test.ts index 3b83a237f0d..61fa3a6d6c7 100644 --- a/client/browser/src/shared/code-hosts/bitbucket/scrape.test.ts +++ b/client/browser/src/shared/code-hosts/bitbucket/scrape.test.ts @@ -8,17 +8,22 @@ import { getFileInfoWithoutCommitIDsFromMultiFileDiffCodeView, isCommitsView, isPullRequestView, + windowLocation__testingOnly, } from './scrape' describe('Bitbucket scrape.ts', () => { + afterEach(() => { + windowLocation__testingOnly.value = null + }) + describe('getFileInfoFromSingleFileSourceCodeView()', () => { afterEach(() => { document.body.innerHTML = '' }) it('should get the FileInfo for a single file code view', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOUR/repos/mux/browse/context.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOUR/repos/mux/browse/context.go' + ) document.body.innerHTML = await readFile(`${__dirname}/__fixtures__/single-file.html`, 'utf-8') const codeView = document.querySelector('.file-content') const fileInfo = getFileInfoFromSingleFileSourceCodeView(codeView!) @@ -34,9 +39,9 @@ describe('Bitbucket scrape.ts', () => { }) describe('getDiffFileInfoFromMultiFileDiffCodeView()', () => { it('should get the FileInfo for an added file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/new_file.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/new_file.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/added.html`, isFullDocument: false, @@ -52,9 +57,9 @@ describe('Bitbucket scrape.ts', () => { }) }) it('should get the FileInfo for a modified file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/modified.html`, isFullDocument: false, @@ -70,9 +75,9 @@ describe('Bitbucket scrape.ts', () => { }) }) it('should get the FileInfo for a deleted file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/old_test.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/old_test.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/deleted.html`, isFullDocument: false, @@ -88,9 +93,9 @@ describe('Bitbucket scrape.ts', () => { }) }) it('should get the FileInfo for a copied file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux.1.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux.1.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/copied.html`, isFullDocument: false, @@ -106,9 +111,9 @@ describe('Bitbucket scrape.ts', () => { }) }) it('should get the FileInfo for a renamed file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux_test_moved.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/mux_test_moved.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/renamed.html`, isFullDocument: false, @@ -124,9 +129,9 @@ describe('Bitbucket scrape.ts', () => { }) }) it('should get the FileInfo for a moved file', async () => { - jsdom.reconfigure({ - url: 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/test-dir/route.go', - }) + windowLocation__testingOnly.value = new URL( + 'https://bitbucket.test/projects/SOURCEGRAPH/repos/mux/pull-requests/1/diff#dir/test-dir/route.go' + ) const codeView = await getFixtureBody({ htmlFixturePath: `${__dirname}/__fixtures__/code-views/pull-request/split/moved.html`, isFullDocument: false, diff --git a/client/browser/src/shared/code-hosts/bitbucket/scrape.ts b/client/browser/src/shared/code-hosts/bitbucket/scrape.ts index 2ef64157583..6bd9ab94ea0 100644 --- a/client/browser/src/shared/code-hosts/bitbucket/scrape.ts +++ b/client/browser/src/shared/code-hosts/bitbucket/scrape.ts @@ -10,10 +10,16 @@ export interface BitbucketRepoInfo { project: string } +/** + * For testing only, used to set the window.location value. + * @internal + */ +export const windowLocation__testingOnly: { value: Pick | null } = { value: null } + const LINK_SELECTORS = ['a.raw-view-link', 'a.source-view-link', 'a.mode-source'] const bitbucketToSourcegraphRepoName = ({ repoSlug, project }: BitbucketRepoInfo): string => - [window.location.hostname, project, repoSlug].join('/') + [(windowLocation__testingOnly.value ?? window.location).hostname, project, repoSlug].join('/') /** * Attempts to parse the file info from a link element contained in the given @@ -278,7 +284,9 @@ export const getFileInfoWithoutCommitIDsFromMultiFileDiffCodeView = ( } // Get project and repo from the URL - const pathMatch = location.pathname.match(/\/projects\/(.*?)\/repos\/(.*?)\//) + const pathMatch = (windowLocation__testingOnly.value ?? window.location).pathname.match( + /\/projects\/(.*?)\/repos\/(.*?)\// + ) if (!pathMatch) { throw new Error('Location did not match regexp') } @@ -316,9 +324,13 @@ export const getFileInfoFromCommitDiffCodeView = (codeViewElement: HTMLElement): } export function getPRIDFromPathName(): number { - const prIDMatch = window.location.pathname.match(/pull-requests\/(\d*?)\/(diff|overview|commits)/) + const prIDMatch = (windowLocation__testingOnly.value ?? window.location).pathname.match( + /pull-requests\/(\d*?)\/(diff|overview|commits)/ + ) if (!prIDMatch) { - throw new Error(`Could not parse PR ID from pathname: ${window.location.pathname}`) + throw new Error( + `Could not parse PR ID from pathname: ${(windowLocation__testingOnly.value ?? window.location).pathname}` + ) } return parseInt(prIDMatch[1], 10) } diff --git a/client/browser/src/shared/code-hosts/github/codeHost.test.ts b/client/browser/src/shared/code-hosts/github/codeHost.test.ts index 63c57bdd130..0d6a8dbca77 100644 --- a/client/browser/src/shared/code-hosts/github/codeHost.test.ts +++ b/client/browser/src/shared/code-hosts/github/codeHost.test.ts @@ -18,6 +18,7 @@ import { isPrivateRepository, parseHash, } from './codeHost' +import { windowLocation__testingOnly } from './util' const testCodeHost = (fixturePath: string): void => { if (existsSync(fixturePath)) { @@ -83,11 +84,15 @@ describe('github/codeHost', () => { const urlToFile = githubCodeHost.urlToFile! const sourcegraphURL = 'https://sourcegraph.my.org' + afterAll(() => { + windowLocation__testingOnly.value = null + }) + describe('on blob page', () => { beforeAll(() => { - jsdom.reconfigure({ - url: 'https://github.com/sourcegraph/sourcegraph/blob/main/browser/src/shared/code-hosts/code_intelligence.tsx', - }) + windowLocation__testingOnly.value = new URL( + 'https://github.com/sourcegraph/sourcegraph/blob/main/browser/src/shared/code-hosts/code_intelligence.tsx' + ) }) it('returns an URL to the Sourcegraph instance if the location has a viewState', () => { expect( @@ -154,7 +159,9 @@ describe('github/codeHost', () => { }) describe('on pull request page', () => { beforeAll(async () => { - jsdom.reconfigure({ url: 'https://github.com/sourcegraph/sourcegraph/pull/3257/files' }) + windowLocation__testingOnly.value = new URL( + 'https://github.com/sourcegraph/sourcegraph/pull/3257/files' + ) document.documentElement.innerHTML = await readFile( __dirname + '/__fixtures__/github.com/pull-request/vanilla/unified/page.html', 'utf-8' @@ -213,15 +220,8 @@ describe('isPrivateRepository', () => { }) describe('when on "github.com"', () => { - const { location } = window - beforeAll(() => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - delete window.location - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - window.location = new URL('https://github.com') + windowLocation__testingOnly.value = new URL('https://github.com') }) beforeEach(() => { @@ -232,7 +232,7 @@ describe('isPrivateRepository', () => { afterAll(() => { fetch.disableMocks() - window.location = location + windowLocation__testingOnly.value = null }) it('returns [private=true] on unsuccessful request', async () => { diff --git a/client/browser/src/shared/code-hosts/github/codeHost.tsx b/client/browser/src/shared/code-hosts/github/codeHost.tsx index 9ee42beb5cf..cf3d3f39fe2 100644 --- a/client/browser/src/shared/code-hosts/github/codeHost.tsx +++ b/client/browser/src/shared/code-hosts/github/codeHost.tsx @@ -31,7 +31,14 @@ import type { ViewResolver } from '../shared/views' import { diffDomFunctions, searchCodeSnippetDOMFunctions, singleFileDOMFunctions } from './domFunctions' import { resolveDiffFileInfo, resolveFileInfo, resolveSnippetFileInfo } from './fileInfo' -import { getFileContainers, parseURL, getSelectorFor, isNewGitHubUI, getEmbeddedData } from './util' +import { + getFileContainers, + parseURL, + getSelectorFor, + isNewGitHubUI, + getEmbeddedData, + windowLocation__testingOnly, +} from './util' import styles from './codeHost.module.scss' @@ -286,7 +293,8 @@ export function checkIsGitHubEnterprise(): boolean { /** * Returns true if the current page is github.com. */ -export const checkIsGitHubDotCom = (url = window.location.href): boolean => /^https?:\/\/(www\.)?github\.com/.test(url) +export const checkIsGitHubDotCom = (url = (windowLocation__testingOnly.value ?? window.location).href): boolean => + /^https?:\/\/(www\.)?github\.com/.test(url) /** * Returns true if the current page is either github.com or GitHub Enterprise. @@ -383,7 +391,7 @@ export const isPrivateRepository = async ( fetchCache = background.fetchCache, fallbackSelector = '#repository-container-header span.Label' ): Promise => { - if (window.location.hostname !== 'github.com') { + if ((windowLocation__testingOnly.value ?? window.location).hostname !== 'github.com') { return Promise.resolve(true) } try { @@ -418,12 +426,15 @@ export interface GithubCodeHost extends CodeHost { export const isGithubCodeHost = (codeHost: CodeHost): codeHost is GithubCodeHost => codeHost.type === 'github' -const isSimpleSearchPage = (): boolean => window.location.pathname === '/search' -const isAdvancedSearchPage = (): boolean => window.location.pathname === '/search/advanced' -const isRepoSearchPage = (): boolean => !isSimpleSearchPage() && window.location.pathname.endsWith('/search') +const isSimpleSearchPage = (): boolean => (windowLocation__testingOnly.value ?? window.location).pathname === '/search' +const isAdvancedSearchPage = (): boolean => + (windowLocation__testingOnly.value ?? window.location).pathname === '/search/advanced' +const isRepoSearchPage = (): boolean => + !isSimpleSearchPage() && (windowLocation__testingOnly.value ?? window.location).pathname.endsWith('/search') const isSearchResultsPage = (): boolean => // TODO(#44327): Do not rely on window.location.search - it may be present not only on search pages (e.g., issues, pulls, etc.). - Boolean(new URLSearchParams(window.location.search).get('q')) && !isAdvancedSearchPage() + Boolean(new URLSearchParams((windowLocation__testingOnly.value ?? window.location).search).get('q')) && + !isAdvancedSearchPage() const isSearchPage = (): boolean => isSimpleSearchPage() || isAdvancedSearchPage() || isRepoSearchPage() || isSearchResultsPage() @@ -440,7 +451,9 @@ type GithubResultType = | 'users' const getGithubResultType = (): GithubResultType | '' => { - const githubResultType = new URLSearchParams(window.location.search).get('type') + const githubResultType = new URLSearchParams((windowLocation__testingOnly.value ?? window.location).search).get( + 'type' + ) return githubResultType ? (githubResultType.toLowerCase() as GithubResultType) : '' } @@ -466,7 +479,8 @@ const getSourcegraphResultType = (): SourcegraphResultType | '' => { } } -const getSourcegraphResultLanguage = (): string | null => new URLSearchParams(window.location.search).get('l') +const getSourcegraphResultLanguage = (): string | null => + new URLSearchParams((windowLocation__testingOnly.value ?? window.location).search).get('l') const buildSourcegraphQuery = (searchTerms: string[]): string => { const queryParameters = searchTerms.filter(Boolean).map(parameter => parameter.trim()) @@ -482,7 +496,7 @@ const buildSourcegraphQuery = (searchTerms: string[]): string => { } if (isRepoSearchPage()) { - const [user, repo] = window.location.pathname.split('/').filter(Boolean) + const [user, repo] = (windowLocation__testingOnly.value ?? window.location).pathname.split('/').filter(Boolean) queryParameters.push(`repo:${user}/${repo}$`) } @@ -673,7 +687,7 @@ export const githubCodeHost: GithubCodeHost = { routeChange: mutations => mutations.pipe( map(() => { - const { pathname } = window.location + const { pathname } = windowLocation__testingOnly.value ?? window.location // repository file tree navigation const pageType = pathname.slice(1).split('/')[2] @@ -738,7 +752,9 @@ export const githubCodeHost: GithubCodeHost = { } // Make sure the location is also on this github instance, return an absolute URL otherwise. - const sameCodeHost = target.rawRepoName.startsWith(window.location.hostname) + const sameCodeHost = target.rawRepoName.startsWith( + (windowLocation__testingOnly.value ?? window.location).hostname + ) if (!sameCodeHost) { return toAbsoluteBlobURL(sourcegraphURL, target) } @@ -763,7 +779,7 @@ export const githubCodeHost: GithubCodeHost = { const anchorPath = header.dataset.path if (anchorPath === target.filePath) { const anchorUrl = header.dataset.anchor - const url = new URL(window.location.href) + const url = new URL((windowLocation__testingOnly.value ?? window.location).href) url.hash = anchorUrl if (target.position) { // GitHub uses L for the left side, R for both right side and the unchanged/white parts @@ -787,7 +803,7 @@ export const githubCodeHost: GithubCodeHost = { }, observeLineSelection: fromEvent(window, 'hashchange').pipe( startWith(undefined), // capture initial value - map(() => parseHash(window.location.hash)) + map(() => parseHash((windowLocation__testingOnly.value ?? window.location).hash)) ), codeViewsRequireTokenization: true, } diff --git a/client/browser/src/shared/code-hosts/github/domFunctions.test.tsx b/client/browser/src/shared/code-hosts/github/domFunctions.test.tsx index a9c0e03b447..0ee15b73464 100644 --- a/client/browser/src/shared/code-hosts/github/domFunctions.test.tsx +++ b/client/browser/src/shared/code-hosts/github/domFunctions.test.tsx @@ -1,10 +1,11 @@ -import { beforeEach, describe, expect, it } from '@jest/globals' +import { afterEach, beforeEach, describe, expect, it } from '@jest/globals' import { startCase } from 'lodash' import type { Omit } from 'utility-types' import { type DOMFunctionsTest, getFixtureBody, testDOMFunctions } from '../shared/codeHostTestUtils' import { diffDomFunctions, isDomSplitDiff, singleFileDOMFunctions } from './domFunctions' +import { windowLocation__testingOnly } from './util' type GitHubVersion = 'github.com' | 'ghe-2.14.11' @@ -131,12 +132,14 @@ describe('GitHub DOM functions', () => { ] for (const { view, url } of views) { describe(`${startCase(view)} page`, () => { - beforeEach(() => { - // TODO ideally DOM functions would not look at global state like the URL. - jsdom.reconfigure({ url }) - }) for (const extension of ['vanilla', 'refined-github']) { describe(startCase(extension), () => { + beforeEach(() => { + windowLocation__testingOnly.value = new URL(url) + }) + afterEach(() => { + windowLocation__testingOnly.value = null + }) if (view === 'pull-request-discussion') { it('should return false', async () => { const codeViewElement = await getFixtureBody({ diff --git a/client/browser/src/shared/code-hosts/github/domFunctions.ts b/client/browser/src/shared/code-hosts/github/domFunctions.ts index e83b591da5b..a69c1a9ba6f 100644 --- a/client/browser/src/shared/code-hosts/github/domFunctions.ts +++ b/client/browser/src/shared/code-hosts/github/domFunctions.ts @@ -233,8 +233,7 @@ export const searchCodeSnippetDOMFunctions: DOMFunctions = { /** * Returns if the current view shows diffs with split (vs. unified) view. - * - * @param element, either an element contained in a code view or the code view itself + * @param element either an element contained in a code view or the code view itself */ export function isDomSplitDiff(element: HTMLElement): boolean { const { pageType } = parseURL() diff --git a/client/browser/src/shared/code-hosts/github/fileInfo.test.ts b/client/browser/src/shared/code-hosts/github/fileInfo.test.ts index c17049451f7..46350e6f4a9 100644 --- a/client/browser/src/shared/code-hosts/github/fileInfo.test.ts +++ b/client/browser/src/shared/code-hosts/github/fileInfo.test.ts @@ -41,8 +41,7 @@ describe('github/fileInfo', () => { for (const { url, rev, filePath } of toReturn) { it(`returns "${filePath}" for URL "${url}" and revision "${rev}"`, () => { - jsdom.reconfigure({ url }) - expect(getFilePathFromURL(rev)).toBe(filePath) + expect(getFilePathFromURL(rev, new URL(url))).toBe(filePath) }) } @@ -61,9 +60,8 @@ describe('github/fileInfo', () => { for (const { url, rev, reason } of toThrow) { it(`throws an error for URL "${url}" and revision "${rev}", reason: "${reason}"`, () => { - jsdom.reconfigure({ url }) expect(() => { - getFilePathFromURL(rev) + getFilePathFromURL(rev, new URL(url)) }).toThrow() }) } diff --git a/client/browser/src/shared/code-hosts/github/util.tsx b/client/browser/src/shared/code-hosts/github/util.tsx index 592a4c4e5b8..c3d764ebaa3 100644 --- a/client/browser/src/shared/code-hosts/github/util.tsx +++ b/client/browser/src/shared/code-hosts/github/util.tsx @@ -3,6 +3,12 @@ import type { RawRepoSpec, RepoSpec } from '@sourcegraph/shared/src/util/url' import type { DiffResolvedRevisionSpec } from '../../repo' import { RepoURLParseError } from '../shared/errors' +/** + * For testing only, used to set the window.location value. + * @internal + */ +export const windowLocation__testingOnly: { value: URL | null } = { value: null } + /** * Returns the elements on the page which should be marked * up with tooltips & links: @@ -237,10 +243,10 @@ export function getFilePath(): string { * making the boundary between the branch name and file path ambiguous. * E.g., in URL "https://github.com/sourcegraph/sourcegraph/blob/bext/release/package.json" branch name is "bext/release". */ -export function getFilePathFromURL(rev: string): string { +export function getFilePathFromURL(rev: string, windowLocation__testingOnly: URL | Location = window.location): string { // ///(blob|tree)// // eslint-disable-next-line unicorn/no-unreadable-array-destructuring - const [, , , pageType, ...revAndPathParts] = window.location.pathname.split('/') + const [, , , pageType, ...revAndPathParts] = windowLocation__testingOnly.pathname.split('/') const revAndPath = revAndPathParts.join('/') if (!revAndPath.startsWith(rev) || (pageType !== 'tree' && revAndPath.length === rev.length)) { throw new Error('Failed to extract the file path from the URL.') @@ -273,11 +279,11 @@ export function isDiffPageType(pageType: GitHubURL['pageType']): boolean { } } -export function parseURL(location: Pick = window.location): GitHubURL { - const { host, pathname } = location +export function parseURL(location?: Pick): GitHubURL { + const { pathname, href, host } = location ?? windowLocation__testingOnly.value ?? window.location const [user, ghRepoName, pageType, ...rest] = pathname.slice(1).split('/') if (!user || !ghRepoName) { - throw new RepoURLParseError(`Could not parse repoName from GitHub url: ${location.href}`) + throw new RepoURLParseError(`Could not parse repoName from GitHub url: ${href}`) } const repoName = `${user}/${ghRepoName}` const rawRepoName = `${host}/${repoName}` diff --git a/client/browser/src/shared/code-hosts/gitlab/__fixtures__/merge-request.html b/client/browser/src/shared/code-hosts/gitlab/__fixtures__/merge-request.html index cd5208f9a04..24eb38a6d09 100644 --- a/client/browser/src/shared/code-hosts/gitlab/__fixtures__/merge-request.html +++ b/client/browser/src/shared/code-hosts/gitlab/__fixtures__/merge-request.html @@ -1,42 +1,42 @@ - - + + - + - + Test Merge Request (!1) · Merge Requests · sourcegraph / jsonrpc2 · GitLab - - + + - - - - - - - - + + + + + + + - - - + + + @@ -125,33 +125,33 @@ @@ -181,7 +181,7 @@ window, document, 'script', - 'https://assets.gitlab-static.net/assets/snowplow/sp-e10fd598642f1a4dd3e9e0e026f6a1ffa3c31b8a40efd92db3f92d32873baed6.js', + 'https://example.com/assets/snowplow/sp-e10fd598642f1a4dd3e9e0e026f6a1ffa3c31b8a40efd92db3f92d32873baed6.js', 'snowplow' ) @@ -204,7 +204,7 @@ @@ -468,7 +468,7 @@ class="avatar s40 avatar-tile js-lazy-loaded qa-js-lazy-loaded" width="40" height="40" - src="https://assets.gitlab-static.net/uploads/-/system/project/avatar/250833/runner_logo.png?width=40" + src="https://example.com/uploads/-/system/project/avatar/250833/runner_logo.png?width=40" />
@@ -869,7 +869,7 @@ class="avatar-tile js-lazy-loaded qa-js-lazy-loaded" width="15" height="15" - src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=15" + src="https://example.com/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=15" />GitLab.org gitlab-runner { @@ -23,11 +29,14 @@ describe('gitlab/codeHost', () => { beforeAll(async () => { document.documentElement.innerHTML = await readFile(__dirname + '/__fixtures__/merge-request.html', 'utf-8') - jsdom.reconfigure({ url: 'https://gitlab.com/SourcegraphCody/jsonrpc2/merge_requests/1/diffs' }) + windowLocation__testingOnly.value = new URL( + 'https://gitlab.com/SourcegraphCody/jsonrpc2/merge_requests/1/diffs' + ) globalThis.gon = { gitlab_url: 'https://gitlab.com' } }) afterAll(() => { + windowLocation__testingOnly.value = null // Reset resolved Sourcegraph repo name value repoNameOnSourcegraph.next('') }) diff --git a/client/browser/src/shared/code-hosts/gitlab/codeHost.ts b/client/browser/src/shared/code-hosts/gitlab/codeHost.ts index c2efb6adbe5..be88504caa4 100644 --- a/client/browser/src/shared/code-hosts/gitlab/codeHost.ts +++ b/client/browser/src/shared/code-hosts/gitlab/codeHost.ts @@ -186,6 +186,14 @@ export const parseHash = (hash: string): LineOrPositionOrRange => { return lpr } +/** + * For testing only, used to set the window.location value. + * @internal + */ +export const windowLocation__testingOnly: { value: URL | null } = { + value: null, +} + export const gitlabCodeHost = subtypeOf()({ type: 'gitlab', name: 'GitLab', @@ -202,7 +210,10 @@ export const gitlabCodeHost = subtypeOf()({ // A view state means that a panel must be shown, and panels are currently only supported on // Sourcegraph (not code hosts). // Make sure the location is also on this Gitlab instance, return an absolute URL otherwise. - if (target.viewState || !target.rawRepoName.startsWith(window.location.hostname)) { + if ( + target.viewState || + !target.rawRepoName.startsWith((windowLocation__testingOnly.value ?? window.location).hostname) + ) { return toAbsoluteBlobURL(sourcegraphURL, target) } @@ -217,7 +228,7 @@ export const gitlabCodeHost = subtypeOf()({ continue } if (!target.position) { - const url = new URL(window.location.href) + const url = new URL((windowLocation__testingOnly.value ?? window.location).href) url.hash = codeView.id return url.href } @@ -225,10 +236,14 @@ export const gitlabCodeHost = subtypeOf()({ const link = codeView.querySelector( `${partSelector} a[data-linenumber="${target.position.line}"]` ) - if (!link) { + + // Use link.getAttribute('href') because link.href silently resolves against the the + // jsdom current URL (https://localhost:3000) in testing. + const href = link?.getAttribute('href') + if (!href) { break } - return new URL(link.href).href + return new URL(href, windowLocation__testingOnly.value ?? window.location.href).href } } @@ -267,7 +282,7 @@ export const gitlabCodeHost = subtypeOf()({ // despite the URL hash is updated. observeLineSelection: fromEvent(document, 'click').pipe( filter(event => (event.target as HTMLElement).matches('a[data-line-number]')), - map(() => parseHash(window.location.hash)) + map(() => parseHash((windowLocation__testingOnly.value ?? window.location).hash)) ), prepareCodeHost: async requestGraphQL => diff --git a/client/browser/src/shared/code-hosts/phabricator/fileInfo.test.ts b/client/browser/src/shared/code-hosts/phabricator/fileInfo.test.ts index 23964f1ad24..80a62213926 100644 --- a/client/browser/src/shared/code-hosts/phabricator/fileInfo.test.ts +++ b/client/browser/src/shared/code-hosts/phabricator/fileInfo.test.ts @@ -123,7 +123,8 @@ function mockQueryConduit(responseMap?: ConduitResponseMap): QueryConduitHelper< type Resolver = ( codeView: HTMLElement, requestGraphQL: PlatformContext['requestGraphQL'], - queryConduit: QueryConduitHelper + queryConduit: QueryConduitHelper, + windowLocation__testingOnly: Location | URL ) => Observable interface Fixture { @@ -140,7 +141,6 @@ const resolveFileInfoFromFixture = async ( ): Promise => { const fixtureContent = await readFile(`${__dirname}/__fixtures__/pages/${htmlFixture}`, 'utf-8') document.body.innerHTML = fixtureContent - jsdom.reconfigure({ url }) const codeView = document.querySelector(codeViewSelector) if (!codeView) { throw new Error(`Code view matching selector ${codeViewSelector} not found`) @@ -151,7 +151,8 @@ const resolveFileInfoFromFixture = async ( ...DEFAULT_GRAPHQL_RESPONSES, ...graphQLResponseMap, }), - mockQueryConduit(conduitResponseMap) + mockQueryConduit(conduitResponseMap), + new URL(url) ).toPromise() } diff --git a/client/browser/src/shared/code-hosts/phabricator/fileInfo.ts b/client/browser/src/shared/code-hosts/phabricator/fileInfo.ts index f602432548a..1bf6e771bd3 100644 --- a/client/browser/src/shared/code-hosts/phabricator/fileInfo.ts +++ b/client/browser/src/shared/code-hosts/phabricator/fileInfo.ts @@ -13,9 +13,10 @@ import { getPhabricatorState } from './util' export const resolveRevisionFileInfo = ( codeView: HTMLElement, requestGraphQL: PlatformContext['requestGraphQL'], - queryConduit = queryConduitHelper + queryConduit = queryConduitHelper, + windowLocation__testingOnly: Location | URL = window.location ): Observable => - getPhabricatorState(window.location, requestGraphQL, queryConduit).pipe( + getPhabricatorState(windowLocation__testingOnly, requestGraphQL, queryConduit).pipe( map((state): DiffInfo => { if (state.mode !== PhabricatorMode.Revision) { throw new Error( @@ -42,9 +43,10 @@ export const resolveRevisionFileInfo = ( export const resolveDiffFileInfo = ( codeView: HTMLElement, requestGraphQL: PlatformContext['requestGraphQL'], - queryConduit = queryConduitHelper + queryConduit = queryConduitHelper, + windowLocation__testingOnly: Location | URL = window.location ): Observable => - getPhabricatorState(window.location, requestGraphQL, queryConduit).pipe( + getPhabricatorState(windowLocation__testingOnly, requestGraphQL, queryConduit).pipe( switchMap(state => { if (state.mode !== PhabricatorMode.Differential) { throw new Error(`Unexpected PhabricatorState for resolveDiffFileInfo, PhabricatorMode: ${state.mode}`) @@ -116,9 +118,10 @@ export const resolveDiffFileInfo = ( export const resolveDiffusionFileInfo = ( codeView: HTMLElement, requestGraphQL: PlatformContext['requestGraphQL'], - queryConduit = queryConduitHelper + queryConduit = queryConduitHelper, + windowLocation__testingOnly: Location | URL = window.location ): Observable => - getPhabricatorState(window.location, requestGraphQL, queryConduit).pipe( + getPhabricatorState(windowLocation__testingOnly, requestGraphQL, queryConduit).pipe( map((state): BlobInfo => { if (state.mode !== PhabricatorMode.Diffusion) { throw new Error( diff --git a/client/browser/src/shared/code-hosts/phabricator/util.tsx b/client/browser/src/shared/code-hosts/phabricator/util.tsx index f1be099c01e..f150bb0435c 100644 --- a/client/browser/src/shared/code-hosts/phabricator/util.tsx +++ b/client/browser/src/shared/code-hosts/phabricator/util.tsx @@ -79,7 +79,7 @@ function getBaseCommitIDFromRevisionPage(): string { } export function getPhabricatorState( - location: Location, + location: URL | Location, requestGraphQL: PlatformContext['requestGraphQL'], queryConduit: QueryConduitHelper ): Observable { diff --git a/client/browser/src/shared/code-hosts/shared/codeHostTestUtils.ts b/client/browser/src/shared/code-hosts/shared/codeHostTestUtils.ts index 158e6b6dccb..79aede82505 100644 --- a/client/browser/src/shared/code-hosts/shared/codeHostTestUtils.ts +++ b/client/browser/src/shared/code-hosts/shared/codeHostTestUtils.ts @@ -1,12 +1,14 @@ import assert from 'assert' -import { beforeEach, describe, expect, it } from '@jest/globals' +import { afterEach, 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' import type { DiffPart } from '@sourcegraph/codeintellify' +import { windowLocation__testingOnly as windowLocation__testingOnly__github } from '../github/util' + import type { CodeHost, MountGetter } from './codeHost' import type { CodeView, DOMFunctions } from './codeViews' @@ -154,10 +156,13 @@ export function testDOMFunctions( let codeViewElement: HTMLElement beforeEach(async () => { if (url) { - jsdom.reconfigure({ url }) + windowLocation__testingOnly__github.value = new URL(url) } codeViewElement = await getFixtureBody({ htmlFixturePath, isFullDocument: false }) }) + afterEach(() => { + windowLocation__testingOnly__github.value = null + }) for (const { diffPart, lineNumber, firstCharacterIsDiffIndicator } of codeElements) { describe( `line number ${lineNumber}` + (diffPart !== undefined ? ` in ${String(diffPart)} diff part` : ''), diff --git a/client/browser/src/shared/code-hosts/shared/views.test.ts b/client/browser/src/shared/code-hosts/shared/views.test.ts index 67875532d6e..48374933b24 100644 --- a/client/browser/src/shared/code-hosts/shared/views.test.ts +++ b/client/browser/src/shared/code-hosts/shared/views.test.ts @@ -4,7 +4,7 @@ import { from, type Observable, of, Subject, Subscription, NEVER } from 'rxjs' import { bufferCount, map, switchMap, toArray } from 'rxjs/operators' import * as sinon from 'sinon' -import { createBarrier } from '@sourcegraph/shared/src/testing/testHelpers' +import { createBarrier } from '@sourcegraph/testing' import type { MutationRecordLike } from '../../util/dom' diff --git a/client/browser/tsconfig.json b/client/browser/tsconfig.json index d952d60d7a0..32f7ee111b1 100644 --- a/client/browser/tsconfig.json +++ b/client/browser/tsconfig.json @@ -51,5 +51,8 @@ { "path": "../wildcard", }, + { + "path": "../testing", + }, ], } diff --git a/client/build-config/package.json b/client/build-config/package.json index b961c8885d6..4dd684a6261 100644 --- a/client/build-config/package.json +++ b/client/build-config/package.json @@ -25,10 +25,5 @@ "sass": "^1.32.4", "signale": "^1.4.0", "typed-scss-modules": "^4.1.1" - }, - "pnpm": { - "peerDependencyRules": { - "ignoreMissing": ["webpack"] - } } } diff --git a/client/common/src/util/url.ts b/client/common/src/util/url.ts index 84ef2d95c72..4a8832bf4a9 100644 --- a/client/common/src/util/url.ts +++ b/client/common/src/util/url.ts @@ -122,8 +122,11 @@ export const encodeURIPathComponent = (component: string): string => /** * Returns true if the given URL points outside the current site. */ -export const isExternalLink = (url: string): boolean => - !!tryCatch(() => new URL(url, window.location.href).origin !== window.location.origin) +export const isExternalLink = ( + url: string, + windowLocation__testingOnly: Pick = window.location +): boolean => + !!tryCatch(() => new URL(url, windowLocation__testingOnly.href).origin !== windowLocation__testingOnly.origin) /** * Stringifies the provided search parameters, replaces encoded `/` and `:` characters, diff --git a/client/http-client/BUILD.bazel b/client/http-client/BUILD.bazel index 7e0082d8350..4d2c108d3dc 100644 --- a/client/http-client/BUILD.bazel +++ b/client/http-client/BUILD.bazel @@ -12,6 +12,7 @@ ts_config( deps = [ "//:tsconfig", "//client/common:tsconfig", + "//client/testing:tsconfig", ], ) @@ -57,6 +58,7 @@ ts_project( tsconfig = ":tsconfig", deps = [ ":http-client_lib", + ":node_modules/@sourcegraph/testing", "//:node_modules/@apollo/client", "//:node_modules/@jest/globals", "//:node_modules/@types/sinon", diff --git a/client/http-client/package.json b/client/http-client/package.json index 75c216d8453..f96f3a1981b 100644 --- a/client/http-client/package.json +++ b/client/http-client/package.json @@ -11,6 +11,7 @@ "test": "jest" }, "dependencies": { - "@sourcegraph/common": "workspace:*" + "@sourcegraph/common": "workspace:*", + "@sourcegraph/testing": "workspace:*" } } diff --git a/client/http-client/src/graphql/apollo/fromObservableQuery.test.ts b/client/http-client/src/graphql/apollo/fromObservableQuery.test.ts index ee2eb089805..90e3bceb92c 100644 --- a/client/http-client/src/graphql/apollo/fromObservableQuery.test.ts +++ b/client/http-client/src/graphql/apollo/fromObservableQuery.test.ts @@ -4,6 +4,8 @@ import delay from 'delay' import { isObservable } from 'rxjs' import sinon from 'sinon' +import { createBarrier } from '@sourcegraph/testing' + import { fromObservableQuery, fromObservableQueryPromise } from './fromObservableQuery' const QUERY_RESULT = { data: {}, loading: false, networkStatus: 1 } @@ -25,13 +27,16 @@ describe('fromObservableQuery', () => { expect(isObservable(observable)).toBe(true) }) - it('subscribes to `ObservableQuery` data', done => { + it('subscribes to `ObservableQuery` data', async () => { + const { wait, done } = createBarrier() const observable = fromObservableQuery(createObservableQuery()) + // eslint-disable-next-line rxjs/no-ignored-subscription observable.subscribe(data => { expect(data).toEqual(QUERY_RESULT) done() }) + await wait }) it('exposes `ObservableQuery` unsubscribe method', () => { @@ -49,13 +54,17 @@ describe('fromObservableQueryPromise', () => { expect(isObservable(observable)).toBe(true) }) - it('subscribes to `ObservableQuery` data', done => { + it('subscribes to `ObservableQuery` data', async () => { + const { wait, done } = createBarrier() + const observable = fromObservableQueryPromise(Promise.resolve(createObservableQuery())) + // eslint-disable-next-line rxjs/no-ignored-subscription observable.subscribe(data => { expect(data).toEqual(QUERY_RESULT) done() }) + await wait }) it('exposes `ObservableQuery` unsubscribe method', () => { diff --git a/client/http-client/tsconfig.json b/client/http-client/tsconfig.json index a9485fc71c1..51cf2864356 100644 --- a/client/http-client/tsconfig.json +++ b/client/http-client/tsconfig.json @@ -13,5 +13,8 @@ { "path": "../common", }, + { + "path": "../testing", + }, ], } diff --git a/client/observability-server/src/webBundleSize/__mocks__/bundlesize.config.js b/client/observability-server/src/webBundleSize/__mocks__/bundlesize.config.js new file mode 100644 index 00000000000..9fa565ac313 --- /dev/null +++ b/client/observability-server/src/webBundleSize/__mocks__/bundlesize.config.js @@ -0,0 +1,14 @@ +const MOCK_ASSETS_PATH = __dirname + '/assets' + +module.exports = { + files: [ + { + path: MOCK_ASSETS_PATH + '/scripts/*.js', + maxSize: '10kb', + }, + { + path: MOCK_ASSETS_PATH + '/styles/*.css', + maxSize: '10kb', + }, + ], +} diff --git a/client/observability-server/src/webBundleSize/__mocks__/web.manifest.json b/client/observability-server/src/webBundleSize/__mocks__/web.manifest.json new file mode 100644 index 00000000000..01c162f1c22 --- /dev/null +++ b/client/observability-server/src/webBundleSize/__mocks__/web.manifest.json @@ -0,0 +1,4 @@ +{ + "main.js": "/.assets/scripts/main.js", + "main.css": "/.assets/styles/main.css" +} diff --git a/client/observability-server/src/webBundleSize/getBundleSizeStats.test.ts b/client/observability-server/src/webBundleSize/getBundleSizeStats.test.ts index bf90c3533ee..45bc30048f3 100644 --- a/client/observability-server/src/webBundleSize/getBundleSizeStats.test.ts +++ b/client/observability-server/src/webBundleSize/getBundleSizeStats.test.ts @@ -1,43 +1,17 @@ import path from 'path' -import { describe, expect, it, jest } from '@jest/globals' +import { describe, expect, it } from '@jest/globals' import { getBundleSizeStats } from './getBundleSizeStats' const MOCK_ASSETS_PATH = path.join(__dirname, './__mocks__/assets') -jest.mock( - 'bundlesize.config.js', - () => ({ - files: [ - { - path: MOCK_ASSETS_PATH + '/scripts/*.js', - maxSize: '10kb', - }, - { - path: MOCK_ASSETS_PATH + '/styles/*.css', - maxSize: '10kb', - }, - ], - }), - { virtual: true } -) - -jest.mock( - 'web.manifest.json', - () => ({ - 'main.js': '/.assets/scripts/main.js', - 'main.css': '/.assets/styles/main.css', - }), - { virtual: true } -) - describe('getBundleSizeStats', () => { it('collects bundle stats based on bundlesize config', () => { const stats = getBundleSizeStats({ staticAssetsPath: MOCK_ASSETS_PATH, - bundlesizeConfigPath: 'bundlesize.config.js', - webBuildManifestPath: 'web.manifest.json', + bundlesizeConfigPath: __dirname + '/__mocks__/bundlesize.config.js', + webBuildManifestPath: __dirname + '/__mocks__/web.manifest.json', }) expect(stats).toEqual({ diff --git a/client/shared/src/actions/ActionItem.test.tsx b/client/shared/src/actions/ActionItem.test.tsx index 4ff77bcc741..8e807f03aca 100644 --- a/client/shared/src/actions/ActionItem.test.tsx +++ b/client/shared/src/actions/ActionItem.test.tsx @@ -1,16 +1,15 @@ -import { describe, expect, it, test, jest } from '@jest/globals' +import { afterEach, describe, expect, it, test, jest } from '@jest/globals' import { render, screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' import * as H from 'history' import { NEVER } from 'rxjs' -import { assertAriaEnabled } from '@sourcegraph/testing' +import { assertAriaEnabled, createBarrier } from '@sourcegraph/testing' import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' import { NOOP_TELEMETRY_SERVICE } from '../telemetry/telemetryService' -import { createBarrier } from '../testing/testHelpers' -import { ActionItem } from './ActionItem' +import { ActionItem, windowLocation__testingOnly } from './ActionItem' jest.mock('mdi-react/OpenInNewIcon', () => 'OpenInNewIcon') @@ -163,7 +162,9 @@ describe('ActionItem', () => { // Finish execution. (Use setTimeout to wait for the executeCommand resolution to result in the setState // call.) done() - await new Promise(resolve => setTimeout(resolve)) + await waitFor(() => { + expect(screen.queryByTestId('action-item-spinner')).not.toBeInTheDocument() + }) expect(asFragment()).toMatchSnapshot() }) @@ -195,8 +196,12 @@ describe('ActionItem', () => { }) describe('"open" command', () => { + afterEach(() => { + windowLocation__testingOnly.value = null + }) + it('renders as link', () => { - jsdom.reconfigure({ url: 'https://example.com/foo' }) + windowLocation__testingOnly.value = new URL('https://example.com/foo') const { asFragment } = renderWithBrandedContext( { }) it('renders as link with icon and opens a new tab for a different origin', () => { - jsdom.reconfigure({ url: 'https://example.com/foo' }) + windowLocation__testingOnly.value = new URL('https://example.com/foo') const { asFragment } = renderWithBrandedContext( { }) it('renders as link that opens in a new tab, but without icon for a different origin as the alt action and a primary action defined', () => { - jsdom.reconfigure({ url: 'https://example.com/foo' }) + windowLocation__testingOnly.value = new URL('https://example.com/foo') const { asFragment } = renderWithBrandedContext( | null } = { value: null } + export class ActionItem extends React.PureComponent { public static contextType = WildcardThemeContext public context!: React.ContextType @@ -237,7 +243,7 @@ export class ActionItem extends React.PureComponent t + diff --git a/client/shared/src/api/client/mainthread-api.test.ts b/client/shared/src/api/client/mainthread-api.test.ts index c449997ae96..6680fcf7c1c 100644 --- a/client/shared/src/api/client/mainthread-api.test.ts +++ b/client/shared/src/api/client/mainthread-api.test.ts @@ -118,7 +118,10 @@ describe('MainThreadAPI', () => { clientApplication: 'other', } - const { api } = initMainThreadAPI(pretendRemote({}), platformContext) + const { api } = initMainThreadAPI( + pretendRemote({ syncSettingsData: () => {} }), + platformContext + ) const edit: SettingsEdit = { path: ['a'], value: 'newVal' } await api.applySettingsEdit(edit) diff --git a/client/shared/src/api/integration-test/languageFeatures.test.ts b/client/shared/src/api/integration-test/languageFeatures.test.ts index ffdf77fcdb7..0af42869ccd 100644 --- a/client/shared/src/api/integration-test/languageFeatures.test.ts +++ b/client/shared/src/api/integration-test/languageFeatures.test.ts @@ -7,8 +7,9 @@ import type * as sourcegraph from 'sourcegraph' import type { MaybeLoadingResult } from '@sourcegraph/codeintellify' import { MarkupKind } from '@sourcegraph/extension-api-classes' import type { Location } from '@sourcegraph/extension-api-types' +import { createBarrier } from '@sourcegraph/testing' -import { assertToJSON, createBarrier, integrationTestContext } from '../../testing/testHelpers' +import { assertToJSON, integrationTestContext } from '../../testing/testHelpers' import { wrapRemoteObservable } from '../client/api/common' import type { FlatExtensionHostAPI } from '../contract' diff --git a/client/shared/src/testing/testHelpers.ts b/client/shared/src/testing/testHelpers.ts index 445222aa14a..cf3704c40d7 100644 --- a/client/shared/src/testing/testHelpers.ts +++ b/client/shared/src/testing/testHelpers.ts @@ -107,17 +107,6 @@ export async function integrationTestContext( } } -/** - * Returns a {@link Promise} and a function. The {@link Promise} blocks until the returned function is called. - * - * @internal - */ -export function createBarrier(): { wait: Promise; done: () => void } { - let done!: () => void - const wait = new Promise(resolve => (done = resolve)) - return { wait, done } -} - export function collectSubscribableValues(subscribable: Subscribable): T[] { const values: T[] = [] subscribable.subscribe(value => values.push(value)) diff --git a/client/shared/src/util/url.test.ts b/client/shared/src/util/url.test.ts index 8cb1ffbfa69..681457a5eab 100644 --- a/client/shared/src/util/url.test.ts +++ b/client/shared/src/util/url.test.ts @@ -426,21 +426,20 @@ describe('buildSearchURLQuery', () => { describe('isExternalLink', () => { it('returns false for the same site', () => { - jsdom.reconfigure({ url: 'https://github.com/here' }) - expect(isExternalLink('https://github.com/there')).toBe(false) + const windowLocation = new URL('https://github.com/here') + expect(isExternalLink('https://github.com/there', windowLocation)).toBe(false) }) it('returns false for relative links', () => { - jsdom.reconfigure({ url: 'https://github.com/here' }) - expect(isExternalLink('/there')).toBe(false) + const windowLocation = new URL('https://github.com/here') + expect(isExternalLink('/there', windowLocation)).toBe(false) }) it('returns false for invalid URLs', () => { - jsdom.reconfigure({ url: 'https://github.com/here' }) - - expect(isExternalLink(' ')).toBe(false) + const windowLocation = new URL('https://github.com/here') + expect(isExternalLink(' ', windowLocation)).toBe(false) }) it('returns true for a different site', () => { - jsdom.reconfigure({ url: 'https://github.com/here' }) - expect(isExternalLink('https://sourcegraph.com/here')).toBe(true) + const windowLocation = new URL('https://github.com/here') + expect(isExternalLink('https://sourcegraph.com/here', windowLocation)).toBe(true) }) }) diff --git a/client/testing/src/index.ts b/client/testing/src/index.ts index 22dad0ea609..d1ebe2c7640 100644 --- a/client/testing/src/index.ts +++ b/client/testing/src/index.ts @@ -1 +1,10 @@ export * from './aria-asserts' + +/** + * Returns a {@link Promise} and a function. The {@link Promise} blocks until the returned function is called. + */ +export function createBarrier(): { wait: Promise; done: () => void } { + let done!: () => void + const wait = new Promise(resolve => (done = resolve)) + return { wait, done } +} diff --git a/client/web/src/components/ErrorBoundary.test.tsx b/client/web/src/components/ErrorBoundary.test.tsx index 67990c4db57..a284597b11b 100644 --- a/client/web/src/components/ErrorBoundary.test.tsx +++ b/client/web/src/components/ErrorBoundary.test.tsx @@ -6,8 +6,8 @@ import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' import { ErrorBoundary } from './ErrorBoundary' -jest.mock('mdi-react/AlertCircleIcon', () => 'AlertCircleIcon') -jest.mock('mdi-react/ReloadIcon', () => 'ReloadIcon') +jest.mock('mdi-react/AlertCircleIcon', () => () => 'AlertCircleIcon') +jest.mock('mdi-react/ReloadIcon', () => () => 'ReloadIcon') const ThrowError: React.FunctionComponent> = () => { throw new Error('x') diff --git a/client/web/src/components/__snapshots__/ErrorBoundary.test.tsx.snap b/client/web/src/components/__snapshots__/ErrorBoundary.test.tsx.snap index 009cc1ec081..ad39fab57f2 100644 --- a/client/web/src/components/__snapshots__/ErrorBoundary.test.tsx.snap +++ b/client/web/src/components/__snapshots__/ErrorBoundary.test.tsx.snap @@ -8,11 +8,7 @@ exports[`ErrorBoundary passes through if non-error 1`] = `
-

-

+
) diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx index 10cc77c03f5..871ec56e463 100644 --- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx +++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx @@ -6,7 +6,7 @@ import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' import { SiteAdminProductLicenseNode } from './SiteAdminProductLicenseNode' import { mockLicenseContext } from './testUtils' -jest.mock('../../../dotcom/productSubscriptions/AccountName', () => ({ AccountName: 'AccountName' })) +jest.mock('../../../dotcom/productSubscriptions/AccountName', () => ({ AccountName: () => 'AccountName' })) describe('SiteAdminProductLicenseNode', () => { const origContext = window.context diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/__snapshots__/SiteAdminProductLicenseNode.test.tsx.snap b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/__snapshots__/SiteAdminProductLicenseNode.test.tsx.snap index 9da71f24b00..d93d1e86c71 100644 --- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/__snapshots__/SiteAdminProductLicenseNode.test.tsx.snap +++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/__snapshots__/SiteAdminProductLicenseNode.test.tsx.snap @@ -49,7 +49,7 @@ exports[`SiteAdminProductLicenseNode active 1`] = ` - + AccountName
- + AccountName
'KeyIcon') -jest.mock('mdi-react/InformationIcon', () => 'InformationIcon') -jest.mock('../../../components/CopyableText', () => ({ CopyableText: 'CopyableText' })) +jest.mock('mdi-react/KeyIcon', () => () => 'KeyIcon') +jest.mock('mdi-react/InformationIcon', () => () => 'InformationIcon') +jest.mock('../../../components/CopyableText', () => ({ CopyableText: () => 'CopyableText' })) describe('UserProductSubscriptionStatus', () => { test('toggle', () => { diff --git a/client/web/src/enterprise/user/productSubscriptions/__snapshots__/UserProductSubscriptionStatus.test.tsx.snap b/client/web/src/enterprise/user/productSubscriptions/__snapshots__/UserProductSubscriptionStatus.test.tsx.snap index b9187fc2a42..8cecb49d99b 100644 --- a/client/web/src/enterprise/user/productSubscriptions/__snapshots__/UserProductSubscriptionStatus.test.tsx.snap +++ b/client/web/src/enterprise/user/productSubscriptions/__snapshots__/UserProductSubscriptionStatus.test.tsx.snap @@ -155,10 +155,7 @@ exports[`UserProductSubscriptionStatus toggle: license key revealed 1`] = ` > License key

- + CopyableText diff --git a/client/web/src/marketing/toast/SurveyToast.test.tsx b/client/web/src/marketing/toast/SurveyToast.test.tsx index 4a73be0bdc4..63918f86b1f 100644 --- a/client/web/src/marketing/toast/SurveyToast.test.tsx +++ b/client/web/src/marketing/toast/SurveyToast.test.tsx @@ -33,9 +33,9 @@ describe('SurveyToast', () => { }) const mockClient = createMockClient( - { contents: JSON.stringify({}) }, + { temporarySettings: { contents: JSON.stringify({}) } }, gql` - query TemporarySettings { + query GetTemporarySettings { temporarySettings { contents } diff --git a/client/web/src/nav/GlobalNavbar.test.tsx b/client/web/src/nav/GlobalNavbar.test.tsx index 94d18b4c832..215b82308c0 100644 --- a/client/web/src/nav/GlobalNavbar.test.tsx +++ b/client/web/src/nav/GlobalNavbar.test.tsx @@ -12,8 +12,8 @@ import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing' import { GlobalNavbar } from './GlobalNavbar' -jest.mock('../search/input/SearchNavbarItem', () => ({ SearchNavbarItem: 'SearchNavbarItem' })) -jest.mock('../components/branding/BrandLogo', () => ({ BrandLogo: 'BrandLogo' })) +jest.mock('../search/input/SearchNavbarItem', () => ({ SearchNavbarItem: () => 'SearchNavbarItem' })) +jest.mock('../components/branding/BrandLogo', () => ({ BrandLogo: () => 'BrandLogo' })) const PROPS: React.ComponentProps = { authenticatedUser: null, diff --git a/client/web/src/nav/__snapshots__/GlobalNavbar.test.tsx.snap b/client/web/src/nav/__snapshots__/GlobalNavbar.test.tsx.snap index 2d949c1887e..495b9ea8202 100644 --- a/client/web/src/nav/__snapshots__/GlobalNavbar.test.tsx.snap +++ b/client/web/src/nav/__snapshots__/GlobalNavbar.test.tsx.snap @@ -13,10 +13,7 @@ exports[`GlobalNavbar default 1`] = ` class="d-flex align-items-center" href="/search" > -