diff --git a/components/GenericError.tsx b/components/GenericError.tsx index 88cd4ee203..24bbdf86a3 100644 --- a/components/GenericError.tsx +++ b/components/GenericError.tsx @@ -3,12 +3,9 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { MarkGithubIcon, CommentDiscussionIcon } from '@primer/octicons-react' -import { useVersion } from 'components/hooks/useVersion' import { Lead } from 'components/ui/Lead' export function GenericError() { - const { isEnterprise } = useVersion() - return (
@@ -28,11 +25,7 @@ export function GenericError() {

diff --git a/components/page-footer/Support.tsx b/components/page-footer/Support.tsx index 9613ad6f4a..a09d6bbaca 100644 --- a/components/page-footer/Support.tsx +++ b/components/page-footer/Support.tsx @@ -1,11 +1,9 @@ import { PeopleIcon, CommentDiscussionIcon } from '@primer/octicons-react' import { useTranslation } from 'components/hooks/useTranslation' -import { useVersion } from 'components/hooks/useVersion' import { useMainContext } from 'components/context/MainContext' export const Support = () => { - const { isEnterprise } = useVersion() const { t } = useTranslation('support') const { communityRedirect } = useMainContext() @@ -25,11 +23,7 @@ export const Support = () => {
diff --git a/pages/404.tsx b/pages/404.tsx index bb555a7198..db0d2c5b1f 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -1,11 +1,9 @@ import { SimpleHeader, SimpleFooter } from 'components/GenericError' import Head from 'next/head' import { CommentDiscussionIcon } from '@primer/octicons-react' -import { useVersion } from 'components/hooks/useVersion' import { Lead } from 'components/ui/Lead' const Custom404 = () => { - const { isEnterprise } = useVersion() return (
@@ -25,11 +23,7 @@ const Custom404 = () => {

diff --git a/tests/rendering/footer.js b/tests/rendering/footer.js index 46f5af6525..ff06162b2c 100644 --- a/tests/rendering/footer.js +++ b/tests/rendering/footer.js @@ -1,5 +1,4 @@ import { getDOM } from '../helpers/supertest.js' -import enterpriseServerReleases from '../../lib/enterprise-server-releases.js' import nonEnterpriseDefaultVersion from '../../lib/non-enterprise-default-version.js' import { jest } from '@jest/globals' @@ -7,29 +6,19 @@ describe('footer', () => { jest.setTimeout(10 * 60 * 1000) describe('"contact us" link', () => { - test('leads to dotcom support on dotcom pages', async () => { + test('leads to support from articles', async () => { const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github`) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) - test('leads to Enterprise support on Enterprise pages', async () => { - const $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}`) - expect($('a#contact-us').attr('href')).toBe('https://enterprise.github.com/support') - }) - - test('leads to Enterprise support on GHEC pages', async () => { - const $ = await getDOM('/en/enterprise-cloud@latest') - expect($('a#contact-us').attr('href')).toBe('https://enterprise.github.com/support') - }) - - test('leads to dotcom support on 404 pages', async () => { + test('leads to support on 404 pages', async () => { const $ = await getDOM('/delicious-snacks/donuts.php', { allow404: true }) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) }) describe('"contact us" link with nextjs', () => { - test('leads to dotcom support on dotcom pages', async () => { + test('leads to support from articles', async () => { const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github?nextjs=`) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') })