diff --git a/src/audit-logs/tests/rendering.js b/src/audit-logs/tests/rendering.js index a1336354e1..4091a722f3 100644 --- a/src/audit-logs/tests/rendering.js +++ b/src/audit-logs/tests/rendering.js @@ -1,7 +1,7 @@ import { expect } from '@jest/globals' import { getDOM } from '#src/tests/helpers/e2etest.js' -import { allTestableVersions } from '#src/versions/lib/all-versions.js' +import { allVersions } from '#src/versions/lib/all-versions.js' import { getAuditLogEvents } from '../lib/index.js' describe('audit log events docs', () => { @@ -26,7 +26,7 @@ describe('audit log events docs', () => { test.each(auditLogEventPages)( 'loads audit log event data for all versions on page %o', async (page) => { - for (const version of allTestableVersions) { + for (const version of Object.keys(allVersions)) { const auditLogEvents = getAuditLogEvents(page.type, version, true) if (Object.keys(auditLogEvents).length === 0) { diff --git a/src/graphql/scripts/sync.js b/src/graphql/scripts/sync.js index 2a36687439..ab8a63d68e 100755 --- a/src/graphql/scripts/sync.js +++ b/src/graphql/scripts/sync.js @@ -28,8 +28,7 @@ async function main() { for (const version of versionsToBuild) { // Get the relevant GraphQL name for the current version // For example, free-pro-team@latest corresponds to dotcom, - // enterprise-server@2.22 corresponds to ghes-2.22, - // and github-ae@latest corresponds to ghae + // enterprise-server@2.22 corresponds to ghes-2.22. const graphqlVersion = allVersions[version].openApiVersionName // 1. UPDATE PREVIEWS diff --git a/src/languages/tests/frame.js b/src/languages/tests/frame.js index 445e507ba0..7603594005 100644 --- a/src/languages/tests/frame.js +++ b/src/languages/tests/frame.js @@ -99,14 +99,6 @@ describe('release notes', () => { const combinations = [] const prefixes = [] for (const version of page.applicableVersions) { - // Like a chicken-and-egg problem, we can't entirely remove - // github-ae from the list of versions because first we - // have to stop depending on it and clean up all front matter - // and all Liquid. But we also shouldn't depend on testing it - // any more since it always redirects to enterprise-cloud. - if (version === 'github-ae@latest') { - continue - } const prefix = version.split('@')[0] if (prefixes.includes(prefix)) { continue diff --git a/src/release-notes/tests/release-notes.js b/src/release-notes/tests/release-notes.js index 0bcbdfe74a..780839e05d 100644 --- a/src/release-notes/tests/release-notes.js +++ b/src/release-notes/tests/release-notes.js @@ -28,12 +28,7 @@ describe('server', () => { expect(res.statusCode).toBe(200) }) - const applicableVersions = page.applicableVersions.filter( - // github-ae can't be deleted from the list of all versions until - // all front matter and all Liquid is cleaned up. This is a legacy - // version and we always redirect it out anyway to enterprise-cloud. - (version) => version !== 'github-ae@latest', - ) + const { applicableVersions } = page test.each(applicableVersions)('version %s that has release-notes', async (version) => { const url = `/en/${version}/admin/release-notes` diff --git a/src/rest/docs.js b/src/rest/docs.js index 55368e3fc5..8c5fb59eaf 100755 --- a/src/rest/docs.js +++ b/src/rest/docs.js @@ -11,11 +11,7 @@ Object.assign( versionMapping, ...Object.entries(invertedVersionMapping).map(([a, b]) => ({ [b]: a })), ) -const openApiVersions = Object.entries(allVersions) - // As of Feb 2024, we can't remove ghae from all-versions.js so instead - // we deliberately filter it out. - .filter(([version]) => version !== 'github-ae@latest') - .map(([, value]) => value) +const openApiVersions = Object.values(allVersions) .map((version) => version.openApiVersionName) .map((version) => (version in versionMapping ? versionMapping[version] : version)) .join(', ') diff --git a/src/rest/scripts/utils/update-markdown.js b/src/rest/scripts/utils/update-markdown.js index 42f3734bf8..ac4aaa45ab 100644 --- a/src/rest/scripts/utils/update-markdown.js +++ b/src/rest/scripts/utils/update-markdown.js @@ -82,7 +82,6 @@ async function getDataFrontmatter(dataDirectory, schemaFilename) { "artifacts": { "versions": { "free-pro-team@latest", - "github-ae@latest", "enterprise-cloud@latest", "enterprise-server@3.4", "enterprise-server@3.5", diff --git a/src/rest/tests/openapi-schema.js b/src/rest/tests/openapi-schema.js index e538e4b7ac..e83ca4a108 100644 --- a/src/rest/tests/openapi-schema.js +++ b/src/rest/tests/openapi-schema.js @@ -194,8 +194,6 @@ describe('code examples are defined', () => { let domain = 'https://api.github.com' if (version.includes('enterprise-server')) { domain = 'http(s)://HOSTNAME/api/v3' - } else if (version === 'github-ae@latest') { - domain = 'https://HOSTNAME/api/v3' } const operation = await findOperation(version, 'GET', '/repos/{owner}/{repo}') diff --git a/src/rest/tests/rendering.js b/src/rest/tests/rendering.js index 18a4ed15b1..39b6c3b883 100644 --- a/src/rest/tests/rendering.js +++ b/src/rest/tests/rendering.js @@ -2,7 +2,7 @@ import { jest, test } from '@jest/globals' import { slug } from 'github-slugger' import { get, getDOM } from '#src/tests/helpers/e2etest.js' -import { isApiVersioned, allVersions, allTestableVersions } from '#src/versions/lib/all-versions.js' +import { isApiVersioned, allVersions } from '#src/versions/lib/all-versions.js' import { getDiffOpenAPIContentRest } from '../scripts/test-open-api-schema.js' import getRest from '#src/rest/lib/index.js' @@ -13,7 +13,7 @@ describe('REST references docs', () => { // in sync. It checks that every version of the /rest/checks // page has every operation defined in the openapi schema. test('loads schema data for all versions', async () => { - for (const version of allTestableVersions) { + for (const version of Object.keys(allVersions)) { const calendarDate = allVersions[version].latestApiVersion const checksRestOperations = await getRest(version, calendarDate, 'checks', 'runs') const $ = await getDOM(`/en/${version}/rest/checks/runs?restVersion=${calendarDate}`) @@ -99,7 +99,7 @@ describe('REST references docs', () => { }) test('REST pages show the correct versions in the api version picker', async () => { - for (const version of allTestableVersions) { + for (const version of Object.keys(allVersions)) { if (isApiVersioned(version)) { for (const apiVersion of allVersions[version].apiVersions) { const $ = await getDOM(`/en/${version}/rest?apiVersion=${apiVersion}`) diff --git a/src/search/tests/rendering.js b/src/search/tests/rendering.js index bd024bc133..1e0bf4a621 100644 --- a/src/search/tests/rendering.js +++ b/src/search/tests/rendering.js @@ -105,7 +105,7 @@ describeIfElasticsearchURL('search rendering page', () => { // Note it testid being 'search-result', not 'search-results' const results = $('[data-testid="search-result"]') expect(results.length).toBeGreaterThan(0) - // Each link should have github-ae@latest in the pathname + // Each link should have enterprise-cloud@latest in the pathname const links = $('[data-testid="search-result"] a') const hrefs = links.map((i, el) => $(el).attr('href')).get() for (const href of hrefs) { diff --git a/src/versions/components/VersionPicker.tsx b/src/versions/components/VersionPicker.tsx index 2c12c89228..bb6ef29e2a 100644 --- a/src/versions/components/VersionPicker.tsx +++ b/src/versions/components/VersionPicker.tsx @@ -32,23 +32,16 @@ export const VersionPicker = ({ xs }: Props) => { return prefix + router.asPath.replace(`/${currentVersion}`, '') } - const allLinks = (page.applicableVersions || []) - .filter((pageVersion) => { - // GHAE is deprecated. As per issue #3589 we're softly removing - // the version from the version picker. The only exception is if - // you're already on a GHAE page. - return pageVersion !== 'github-ae@latest' || currentVersion === 'github-ae@latest' - }) - .map((pageVersion) => ({ - text: allVersions[pageVersion].versionTitle, - selected: currentVersion === pageVersion, - href: versionToHref(pageVersion), - extra: { - arrow: false, - info: false, - }, - divider: false, - })) + const allLinks = (page.applicableVersions || []).map((pageVersion) => ({ + text: allVersions[pageVersion].versionTitle, + selected: currentVersion === pageVersion, + href: versionToHref(pageVersion), + extra: { + arrow: false, + info: false, + }, + divider: false, + })) const hasEnterpriseVersions = (page.applicableVersions || []).some((pageVersion) => pageVersion.startsWith('enterprise-server'), diff --git a/src/versions/lib/all-versions.js b/src/versions/lib/all-versions.js index e6649a8383..2fa4c36431 100755 --- a/src/versions/lib/all-versions.js +++ b/src/versions/lib/all-versions.js @@ -119,14 +119,4 @@ export function getOpenApiVersion(version) { return allVersions[version].openApiVersionName } -export const allTestableVersions = Object.keys(allVersions).filter( - // Because of the deprecation of GHAE we can't delete it from `allVersions` - // until ALL cleaning up is done. Since we're now always redirecting - // all requests for `.../github-ae@latest/...` we also shouldn't test it. - // Other end-to-end tests will test the redirects of that legacy. - // The day `github-ae@latest` is no longer in all-versions.js - // this filtering can be deleted. - (version) => version !== 'github-ae@latest', -) - export { allVersions }