Merge pull request github#16665 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/test.yml

@@ -31,14 +31,15 @@ jobs:
       fail-fast: false
       matrix:
         # The same array lives in test-windows.yml, so make any updates there too.
-        test-group: [
+        test-group:
+          [
             content,
             graphql,
             meta,
             rendering,
             routing,
             unit,
-            # linting,
+            linting,
             translations,
           ]
     steps:
@@ -47,7 +48,10 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
         with:
-          lfs: true
+          # Not all test suites need the LFS files. So instead, we opt to
+          # NOT clone them initially and instead, include them manually
+          # only for the test groups that we know need the files.
+          lfs: ${{ matrix.test-group == 'content' }}
           # Enables cloning the Early Access repo later with the relevant PAT
           persist-credentials: 'false'
 
@@ -98,23 +102,25 @@ jobs:
           mv docs-early-access/data data/early-access
           rm -r docs-early-access
 
+      # This is necessary when LFS files where cloned but does nothing
+      # if actions/checkout was run with `lfs:false`.
       - name: Checkout LFS objects
         run: git lfs checkout
 
-      # - name: Gather files changed
-      #   uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
-      #   id: get_diff_files
-      #   with:
-      #     # So that `steps.get_diff_files.outputs.files` becomes
-      #     # a string like `foo.js path/bar.md`
-      #     output: ' '
+      - name: Gather files changed
+        uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b
+        id: get_diff_files
+        with:
+          # So that `steps.get_diff_files.outputs.files` becomes
+          # a string like `foo.js path/bar.md`
+          output: ' '
 
-      # - name: Insight into changed files
-      #   run: |
+      - name: Insight into changed files
+        run: |
 
-      #     # Must to do this because the list of files can be HUGE. Especially
-      #     # in a repo-sync when there are lots of translation files involved.
-      #     echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
+          # Must to do this because the list of files can be HUGE. Especially
+          # in a repo-sync when there are lots of translation files involved.
+          echo "${{ steps.get_diff_files.outputs.files }}" > get_diff_files.txt
 
       - name: Setup node
         uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
@@ -136,6 +142,6 @@ jobs:
 
       - name: Run tests
         env:
-          # DIFF_FILE: get_diff_files.txt
+          DIFF_FILE: get_diff_files.txt
           CHANGELOG_CACHE_FILE_PATH: tests/fixtures/changelog-feed.json
         run: npm test -- tests/${{ matrix.test-group }}/

components/context/MainContext.tsx

@@ -124,6 +124,7 @@ export type MainContextT = {
 
   status: number
   fullUrl: string
+  isDotComAuthenticated: boolean
 }
 
 export const getMainContext = (req: any, res: any): MainContextT => {
@@ -189,6 +190,7 @@ export const getMainContext = (req: any, res: any): MainContextT => {
     nonEnterpriseDefaultVersion: req.context.nonEnterpriseDefaultVersion,
     status: res.statusCode,
     fullUrl: req.protocol + '://' + req.get('host') + req.originalUrl,
+    isDotComAuthenticated: Boolean(req.cookies.dotcom_user),
   }
 }
 

components/page-header/Header.tsx

@@ -17,7 +17,7 @@ import styles from './Header.module.scss'
 
 export const Header = () => {
   const router = useRouter()
-  const { relativePath, error } = useMainContext()
+  const { isDotComAuthenticated, relativePath, error } = useMainContext()
   const { currentVersion } = useVersion()
   const { t } = useTranslation(['header', 'homepage'])
   const [isMenuOpen, setIsMenuOpen] = useState(
@@ -26,7 +26,8 @@ export const Header = () => {
   const [scroll, setScroll] = useState(false)
 
   const signupCTAVisible =
-    currentVersion === 'free-pro-team@latest' || currentVersion === 'enterprise-cloud@latest'
+    !isDotComAuthenticated &&
+    (currentVersion === 'free-pro-team@latest' || currentVersion === 'enterprise-cloud@latest')
 
   useEffect(() => {
     function onScroll() {

tests/rendering/signup-button.js

@@ -0,0 +1,28 @@
+import { getDOM } from '../helpers/e2etest.js'
+import { describe, expect } from '@jest/globals'
+
+describe('GHEC sign up button', () => {
+  test('present by default', async () => {
+    const $ = await getDOM('/en')
+    expect($('a[href^="https://github.com/signup"]').length).toBeGreaterThan(0)
+  })
+
+  test('present on enterprise-cloud pages', async () => {
+    const $ = await getDOM('/en/enterprise-cloud@latest')
+    expect($('a[href^="https://github.com/signup"]').length).toBeGreaterThan(0)
+  })
+
+  test('not present on enterprise-server pages', async () => {
+    const $ = await getDOM('/en/enterprise-server@latest')
+    expect($('a[href^="https://github.com/signup"]').length).toBe(0)
+  })
+
+  test('not present if dotcom_user cookie', async () => {
+    const $ = await getDOM('/en', {
+      headers: {
+        cookie: 'dotcom_user=peterbe',
+      },
+    })
+    expect($('a[href^="https://github.com/signup"]').length).toBe(0)
+  })
+})