Merge pull request #24731 from github/repo-sync

repo sync

.github/workflows/test.yml

@@ -46,6 +46,8 @@ jobs:
               { name: 'graphql', path: 'tests/graphql', },
               { name: 'events', path: 'src/events/tests', },
               { name: 'automated-pipelines', path: 'src/automated-pipelines/tests', },
+              { name: 'rest', path: 'src/rest/tests', },
+              { name: 'webhooks', path: 'src/webhooks/tests', },
               { name: 'linting', path: 'tests/linting', },
               { name: 'meta', path: 'tests/meta', },
               { name: 'routing', path: 'tests/routing', },

data/graphql/ghae/schema.docs-ghae.graphql

@@ -640,6 +640,11 @@ input AddPullRequestReviewThreadInput {
   The side of the diff on which the start line resides.
   """
   startSide: DiffSide = RIGHT
+
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType = LINE
 }
 
 """
@@ -27909,6 +27914,11 @@ type PullRequestReviewComment implements Comment & Deletable & Minimizable & Nod
   """
   state: PullRequestReviewCommentState!
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Identifies when the comment was last updated.
   """
@@ -28285,6 +28295,11 @@ type PullRequestReviewThread implements Node {
   """
   startLine: Int
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Indicates whether the current viewer can reply to this thread.
   """
@@ -28341,6 +28356,21 @@ type PullRequestReviewThreadEdge {
   node: PullRequestReviewThread
 }
 
+"""
+The possible subject types of a pull request review comment.
+"""
+enum PullRequestReviewThreadSubjectType {
+  """
+  A comment that has been made against the file of a pull request
+  """
+  FILE
+
+  """
+  A comment that has been made against the line of a pull request
+  """
+  LINE
+}
+
 """
 Represents the latest point in the pull request timeline for which the viewer has seen the pull request's commits.
 """

data/graphql/ghec/schema.docs.graphql

@@ -807,6 +807,11 @@ input AddPullRequestReviewThreadInput {
   The side of the diff on which the start line resides.
   """
   startSide: DiffSide = RIGHT
+
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType = LINE
 }
 
 """
@@ -34239,6 +34244,11 @@ type PullRequestReviewComment implements Comment & Deletable & Minimizable & Nod
   """
   state: PullRequestReviewCommentState!
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Identifies when the comment was last updated.
   """
@@ -34615,6 +34625,11 @@ type PullRequestReviewThread implements Node {
   """
   startLine: Int
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Indicates whether the current viewer can reply to this thread.
   """
@@ -34671,6 +34686,21 @@ type PullRequestReviewThreadEdge {
   node: PullRequestReviewThread
 }
 
+"""
+The possible subject types of a pull request review comment.
+"""
+enum PullRequestReviewThreadSubjectType {
+  """
+  A comment that has been made against the file of a pull request
+  """
+  FILE
+
+  """
+  A comment that has been made against the line of a pull request
+  """
+  LINE
+}
+
 """
 Represents the latest point in the pull request timeline for which the viewer has seen the pull request's commits.
 """

data/graphql/schema.docs.graphql

@@ -807,6 +807,11 @@ input AddPullRequestReviewThreadInput {
   The side of the diff on which the start line resides.
   """
   startSide: DiffSide = RIGHT
+
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType = LINE
 }
 
 """
@@ -34239,6 +34244,11 @@ type PullRequestReviewComment implements Comment & Deletable & Minimizable & Nod
   """
   state: PullRequestReviewCommentState!
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Identifies when the comment was last updated.
   """
@@ -34615,6 +34625,11 @@ type PullRequestReviewThread implements Node {
   """
   startLine: Int
 
+  """
+  The level at which the comments in the corresponding thread are targeted, can be a diff line or a file
+  """
+  subjectType: PullRequestReviewThreadSubjectType!
+
   """
   Indicates whether the current viewer can reply to this thread.
   """
@@ -34671,6 +34686,21 @@ type PullRequestReviewThreadEdge {
   node: PullRequestReviewThread
 }
 
+"""
+The possible subject types of a pull request review comment.
+"""
+enum PullRequestReviewThreadSubjectType {
+  """
+  A comment that has been made against the file of a pull request
+  """
+  FILE
+
+  """
+  A comment that has been made against the line of a pull request
+  """
+  LINE
+}
+
 """
 Represents the latest point in the pull request timeline for which the viewer has seen the pull request's commits.
 """

lib/enterprise-dates.json

@@ -142,5 +142,9 @@
   "3.11": {
     "releaseDate": "2023-10-31",
     "deprecationDate": "2024-11-28"
+  },
+  "3.12": {
+    "releaseDate": "2024-02-06",
+    "deprecationDate": "2025-02-27"
   }
 }

src/automated-pipelines/tests/accessibility.js

@@ -0,0 +1,63 @@
+import { jest, test } from '@jest/globals'
+
+import { getDOM } from '../../../tests/helpers/e2etest.js'
+
+describe('automated page heading accessibility', () => {
+  jest.setTimeout(3 * 60 * 1000)
+
+  test('rest pages do not render any headings with duplicate text', async () => {
+    const $ = await getDOM('/en/rest/actions/artifacts')
+    const headingText = $('body')
+      .find('h2, h3, h4, h5, h6')
+      .map((i, el) => $(el).text())
+      .get()
+      .sort()
+
+    const dupes = headingText.filter((item, index) => headingText.indexOf(item) !== index)
+
+    const message = `The following duplicate heading texts were found: ${dupes.join(', ')}`
+    expect(dupes.length, message).toBe(0)
+  })
+
+  test('rest pages do not render any headings with duplicate ids', async () => {
+    const $ = await getDOM('/en/rest/actions/artifacts')
+    const headingIDs = $('body')
+      .find('h2, h3, h4, h5, h6')
+      .map((i, el) => $(el).attr('id'))
+      .get()
+      .sort()
+
+    const dupes = headingIDs.filter((item, index) => headingIDs.indexOf(item) !== index)
+
+    const message = `The following duplicate heading IDs were found: ${dupes.join(', ')}`
+    expect(dupes.length, message).toBe(0)
+  })
+
+  test('webhook pages do not render any headings with duplicate text', async () => {
+    const $ = await getDOM('/en/webhooks-and-events/webhooks/webhook-events-and-payloads')
+    const headingText = $('body')
+      .find('h2, h3, h4, h5, h6')
+      .map((i, el) => $(el).text())
+      .get()
+      .sort()
+
+    const dupes = headingText.filter((item, index) => headingText.indexOf(item) !== index)
+
+    const message = `The following duplicate heading texts were found: ${dupes.join(', ')}`
+    expect(dupes.length, message).toBe(0)
+  })
+
+  test('webhook pages do not render any headings with duplicate ids', async () => {
+    const $ = await getDOM('/en/webhooks-and-events/webhooks/webhook-events-and-payloads')
+    const headingIDs = $('body')
+      .find('h2, h3, h4, h5, h6')
+      .map((i, el) => $(el).attr('id'))
+      .get()
+      .sort()
+
+    const dupes = headingIDs.filter((item, index) => headingIDs.indexOf(item) !== index)
+
+    const message = `The following duplicate heading IDs were found: ${dupes.join(', ')}`
+    expect(dupes.length, message).toBe(0)
+  })
+})

src/graphql/data/dotcom/changelog.json

@@ -1,4 +1,20 @@
 [
+  {
+    "schemaChanges": [
+      {
+        "title": "The GraphQL schema includes these changes:",
+        "changes": [
+          "<p>Type <code>PullRequestReviewThreadSubjectType</code> was added</p>",
+          "<p>Input field <code>subjectType</code> was added to input object type <code>AddPullRequestReviewThreadInput</code></p>",
+          "<p>Field <code>subjectType</code> was added to object type <code>PullRequestReviewComment</code></p>",
+          "<p>Field <code>subjectType</code> was added to object type <code>PullRequestReviewThread</code></p>"
+        ]
+      }
+    ],
+    "previewChanges": [],
+    "upcomingChanges": [],
+    "date": "2023-03-28"
+  },
   {
     "schemaChanges": [
       {

src/graphql/data/dotcom/schema.json

@@ -48552,6 +48552,14 @@
           "kind": "enums",
           "href": "/graphql/reference/enums#pullrequestreviewcommentstate"
         },
+        {
+          "name": "subjectType",
+          "description": "<p>The level at which the comments in the corresponding thread are targeted, can be a diff line or a file.</p>",
+          "type": "PullRequestReviewThreadSubjectType!",
+          "id": "pullrequestreviewthreadsubjecttype",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#pullrequestreviewthreadsubjecttype"
+        },
         {
           "name": "updatedAt",
           "description": "<p>Identifies when the comment was last updated.</p>",
@@ -49055,6 +49063,14 @@
           "kind": "scalars",
           "href": "/graphql/reference/scalars#int"
         },
+        {
+          "name": "subjectType",
+          "description": "<p>The level at which the comments in the corresponding thread are targeted, can be a diff line or a file.</p>",
+          "type": "PullRequestReviewThreadSubjectType!",
+          "id": "pullrequestreviewthreadsubjecttype",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#pullrequestreviewthreadsubjecttype"
+        },
         {
           "name": "viewerCanReply",
           "description": "<p>Indicates whether the current viewer can reply to this thread.</p>",
@@ -78463,6 +78479,23 @@
         }
       ]
     },
+    {
+      "name": "PullRequestReviewThreadSubjectType",
+      "kind": "enums",
+      "id": "pullrequestreviewthreadsubjecttype",
+      "href": "/graphql/reference/enums#pullrequestreviewthreadsubjecttype",
+      "description": "<p>The possible subject types of a pull request review comment.</p>",
+      "values": [
+        {
+          "name": "FILE",
+          "description": "<p>A comment that has been made against the file of a pull request.</p>"
+        },
+        {
+          "name": "LINE",
+          "description": "<p>A comment that has been made against the line of a pull request.</p>"
+        }
+      ]
+    },
     {
       "name": "PullRequestState",
       "kind": "enums",
@@ -83834,6 +83867,14 @@
           "id": "diffside",
           "kind": "enums",
           "href": "/graphql/reference/enums#diffside"
+        },
+        {
+          "name": "subjectType",
+          "description": "<p>The level at which the comments in the corresponding thread are targeted, can be a diff line or a file.</p>",
+          "type": "PullRequestReviewThreadSubjectType",
+          "id": "pullrequestreviewthreadsubjecttype",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#pullrequestreviewthreadsubjecttype"
         }
       ]
     },