Spot redirect orphans better (github#34800)

Author: Peter Bengtsson

content/actions/migrating-to-github-actions/index.md

@@ -8,7 +8,6 @@ versions:
   ghae: '*'
   ghec: '*'
 redirect_from:
-  - /actions/migrating-to-github-actions
   - /articles/migrating-github-actions-from-hcl-syntax-to-yaml-syntax
 children:
   - /automating-migration-with-github-actions-importer
@@ -18,4 +17,3 @@ children:
   - /migrating-from-jenkins-to-github-actions
   - /migrating-from-travis-ci-to-github-actions
 ---
-

content/admin/identity-and-access-management/using-saml-for-enterprise-iam/index.md

@@ -9,7 +9,6 @@ versions:
 redirect_from:
   - /github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account
   - /admin/authentication/managing-identity-and-access-for-your-enterprise
-  - /admin/identity-and-access-management/managing-iam-for-your-enterprise
   - /admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider
   - /enterprise/admin/articles/configuring-saml-authentication
   - /enterprise/admin/articles/about-saml-authentication

content/authentication/authenticating-with-saml-single-sign-on/index.md

@@ -5,7 +5,6 @@ redirect_from:
   - /articles/authenticating-to-a-github-organization-with-saml-single-sign-on
   - /articles/authenticating-with-saml-single-sign-on
   - /github/authenticating-to-github/authenticating-with-saml-single-sign-on
-  - /authentication/authenticating-with-saml-single-sign-on
 versions:
   ghae: '*'
   ghec: '*'
@@ -18,4 +17,3 @@ children:
   - /viewing-and-managing-your-active-saml-sessions
 shortTitle: Authenticate with SAML
 ---
-

lib/permalink.js

@@ -58,8 +58,16 @@ class Permalink {
   }
 
   static relativePathToSuffix(relativePath) {
-    return '/' + relativePath.replace('index.md', '').replace('.md', '')
+    if (relativePath === 'index.md') return '/'
+    // When you turn `foo/bar.md`, which is a file path, into a URL pathname,
+    // you just need to chop off the `.md` suffix.
+    // For `foo/parent/index.md` you can't just chop off the `index.md`
+    // because it would leave a trailing `/`.
+    return `/${relativePath.replace(indexmdSuffixRegex, '').replace(mdSuffixRegex, '')}`
   }
 }
 
+const indexmdSuffixRegex = new RegExp(`${path.sep}index\\.md$`)
+const mdSuffixRegex = /\.md$/
+
 export default Permalink

tests/content/redirect-orphans.js

@@ -1,22 +1,19 @@
 import path from 'path'
-import { jest, beforeAll } from '@jest/globals'
+
+import { jest } from '@jest/globals'
 
 import { loadPages } from '../../lib/page-data.js'
 import Permalink from '../../lib/permalink.js'
 
 describe('redirect orphans', () => {
-  let pageList
-
   // Because calling `loadPages` will trigger a warmup, this can potentially
   // be very slow in CI. So we need a timeout.
   jest.setTimeout(60 * 1000)
 
-  beforeAll(async () => {
+  test('no page is a redirect in another file', async () => {
     // Only doing English because they're the only files we do PRs for.
-    pageList = (await loadPages()).filter((page) => page.languageCode === 'en')
-  })
+    const pageList = await loadPages(undefined, ['en'])
 
-  test('no page is a redirect in another file', () => {
     const redirectFroms = new Map()
     for (const page of pageList) {
       for (const redirectFrom of page.redirect_from || []) {