Merge remote-tracking branch 'origin/master' into tests/menu-button-a…

…ctions-refactor
w3c · Oct 31, 2024 · 304a241 · 304a241
2 parents 26987b0 + 243505e
commit 304a241
Show file tree

Hide file tree

Showing 43 changed files with 5,691 additions and 5,110 deletions.
diff --git a/__test__/__snapshots__/createAllTests.test.js.snap b/__test__/__snapshots__/createAllTests.test.js.snap
diff --git a/lib/data/process-test-directory-v1.js b/lib/data/process-test-directory-v1.js
diff --git a/lib/data/process-test-directory.js → lib/data/process-test-directory/index.js b/lib/data/process-test-directory.js → lib/data/process-test-directory/index.js
diff --git a/lib/data/process-test-directory/utils.js b/lib/data/process-test-directory/utils.js
diff --git a/lib/data/process-test-directory/v1.js b/lib/data/process-test-directory/v1.js
diff --git a/scripts/create-all-tests/createAllTests.js b/scripts/create-all-tests/createAllTests.js
@@ -5,7 +5,7 @@ const {
 } = require('../../lib/data/process-test-directory');
 const {
   processTestDirectory: processTestDirectoryV1,
-} = require('../../lib/data/process-test-directory-v1');
+} = require('../../lib/data/process-test-directory/v1');
 const { consoleText, consoleColors } = require('../../lib/util/console');
 
 const cliArgs = require('minimist')(process.argv.slice(2), {

diff --git a/tests/disclosure-navigation/data/assertions.csv b/tests/disclosure-navigation/data/assertions.csv
@@ -1,21 +1,20 @@
 assertionId,priority,assertionStatement,assertionPhrase,refIds
-listBoundary,1,List boundary is conveyed,convey list boundary,list
-nameAbout,1,"Name of the button, 'About', is conveyed",convey name 'About',button
-nameAcademics,1,"Name of the button, 'Academics', is conveyed",convey name 'Academics',button
-nameAdmissions,1,"Name of the button, 'Admissions', is conveyed",convey name 'Admissions',button
-nameCampusTours,1,"Name of the link, 'Campus Tours', is conveyed",convey name 'Campus Tours',link
-nameMythicalUniversity,1,"Name of the navigation region, 'Mythical University', is conveyed",convey name 'Mythical University',aria-label
-nameMythicalUniversitySamplePageContent,1,"Name of the region, 'Mythical University sample page content', is conveyed",convey name 'Mythical University sample page content',aria-label
-nameOverview,1,"Name of the link, 'Overview', is conveyed",convey name 'Overview',link
-numberListItems3,1,"Number of list items, '3', is conveyed","convey number of list items, '3'",list
-numberListItems4,1,"Number of list items, '4', is conveyed","convey number of list items, 4",list
+headingContentOverview,1,"Content of the heading, 'Overview', is conveyed","convey heading content, 'Overview'",
+listBoundary,3,List boundary is conveyed,convey list boundary,list
+nameAbout,1,"Name of the button, 'About', is conveyed","convey name of the button, 'About'",button
+nameAcademics,1,"Name of the button, 'Academics', is conveyed","convey name of the button, 'Academics'",button
+nameAdmissions,1,"Name of the button, 'Admissions', is conveyed","convey name of the button, 'Admissions'",button
+nameCampusTours,1,"Name of the link, 'Campus Tours', is conveyed","convey name of the link, 'Campus Tours'",link
+nameMythicalUniversity,1,"Name of the navigation region, 'Mythical University', is conveyed","convey name of the navigation region, 'Mythical University'",aria-label
+nameMythicalUniversitySamplePageContent,1,"Name of the region, 'Mythical University sample page content', is conveyed","convey name of the region, 'Mythical University sample page content'",aria-label
+nameOverview,1,"Name of the link, 'Overview', is conveyed","convey name of the link, 'Overview'",link
 roleButton,1,Role 'button' is conveyed,convey role 'button',button
 roleLink,1,Role 'link' is conveyed,convey role 'link',link
-roleList,1,Role 'list' is conveyed,convey role 'list',list
+roleHeading,2,Role 'heading' is conveyed,convey role 'heading',heading
 roleNavigationLandmark,1,Role 'navigation landmark' is conveyed,convey role 'navigation landmark',nav
 roleRegion,1,Role 'Region' is conveyed,convey role 'Region',region
 stateChangeToCollapsed,1,"Change in state, to 'collapsed', is conveyed","convey change in state, to 'collapsed'",aria-expanded
 stateChangeToExpanded,1,"Change in state, to 'expanded', is conveyed","convey change in state, to 'expanded'",aria-expanded
-stateCollapsed,1,State 'collapsed' is conveyed,convey state 'collapsed',aria-expanded
-stateCurrentPage,1,State 'current page' is conveyed,convey state 'current page',aria-current
-stateExpanded,1,State 'expanded' is conveyed,convey state 'expanded',aria-expanded
+stateCollapsed,1,"State of the button, 'collapsed', is conveyed","convey state of the button, 'collapsed'",aria-expanded
+stateCurrentPage,1,"State of the link, 'current page' is conveyed","convey state of the link, 'current page'",aria-current
+stateExpanded,1,"State of the button, 'expanded' is conveyed","convey state of the button, 'expanded'",aria-expanded
diff --git a/tests/disclosure-navigation/data/jaws-commands.csv b/tests/disclosure-navigation/data/jaws-commands.csv
@@ -2,22 +2,22 @@ testId,command,settings,assertionExceptions,presentationNumber
 navForwardsToCollapsedDisclosureButton,b,virtualCursor,,1
 navForwardsToCollapsedDisclosureButton,f,virtualCursor,,1.1
 navForwardsToCollapsedDisclosureButton,tab,virtualCursor,,1.3
-navForwardsToCollapsedDisclosureButton,down down down,virtualCursor,,1.4
+navForwardsToCollapsedDisclosureButton,down down down,virtualCursor,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,1.4
 navForwardsToCollapsedDisclosureButton,tab,pcCursor,,2
 navBackToCollapsedDisclosureButton,shift+b,virtualCursor,,4
 navBackToCollapsedDisclosureButton,shift+f,virtualCursor,,4.1
 navBackToCollapsedDisclosureButton,shift+tab,virtualCursor,,4.3
-navBackToCollapsedDisclosureButton,up up up,virtualCursor,,4.4
+navBackToCollapsedDisclosureButton,up up up,virtualCursor,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,4.4
 navBackToCollapsedDisclosureButton,shift+tab,pcCursor,,5
 navForwardsToExpandedDisclosureButton,b,virtualCursor,,7
 navForwardsToExpandedDisclosureButton,f,virtualCursor,,7.1
 navForwardsToExpandedDisclosureButton,tab,virtualCursor,,7.2
-navForwardsToExpandedDisclosureButton,down down down,virtualCursor,,7.3
+navForwardsToExpandedDisclosureButton,down down down,virtualCursor,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,7.3
 navForwardsToExpandedDisclosureButton,tab,pcCursor,,8
 navBackToExpandedDisclosureButton,shift+b,virtualCursor,,10
 navBackToExpandedDisclosureButton,shift+f,virtualCursor,,10.1
 navBackToExpandedDisclosureButton,shift+tab,virtualCursor,,10.3
-navBackToExpandedDisclosureButton,up up up,virtualCursor,,10.4
+navBackToExpandedDisclosureButton,up up up,virtualCursor,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,10.4
 navBackToExpandedDisclosureButton,shift+tab,pcCursor,,11
 reqInfoAboutCollapsedDisclosureButton,ins+tab,virtualCursor,,33
 reqInfoAboutCollapsedDisclosureButton,ins+up,virtualCursor,,33.1
@@ -35,29 +35,24 @@ operateExpandedDisclosureButton,space,virtualCursor,,42
 operateExpandedDisclosureButton,enter,virtualCursor,,42.1
 operateExpandedDisclosureButton,space,pcCursor,,43
 operateExpandedDisclosureButton,enter,pcCursor,,43.1
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,u,virtualCursor,,45
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,tab,virtualCursor,,45.1
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,down down,virtualCursor,,45.2
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,tab,pcCursor,,46
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,down,pcCursor,,46.1
 navFromExpandedDisclosureButtonToCurrentPageLink,u,virtualCursor,,48
 navFromExpandedDisclosureButtonToCurrentPageLink,tab,virtualCursor,,48.1
-navFromExpandedDisclosureButtonToCurrentPageLink,down down,virtualCursor,,48.2
+navFromExpandedDisclosureButtonToCurrentPageLink,down down,virtualCursor,1:listBoundary,48.2
 navFromExpandedDisclosureButtonToCurrentPageLink,tab,pcCursor,,49
 navFromExpandedDisclosureButtonToCurrentPageLink,down,pcCursor,,49.1
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+b,virtualCursor,,51
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+f,virtualCursor,,51.1
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+tab,virtualCursor,,51.2
-navToExpandedDisclosureButtonFromLinkAssociatedDropdown,up up,virtualCursor,,51.3
+navToExpandedDisclosureButtonFromLinkAssociatedDropdown,up up,virtualCursor,1:listBoundary,51.3
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+tab,pcCursor,,52
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+u,virtualCursor,,54
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+tab,virtualCursor,,54.1
-navFromCollapsedDisclosureButtonToLinkDropdown,up up,virtualCursor,,54.2
+navFromCollapsedDisclosureButtonToLinkDropdown,up up,virtualCursor,1:listBoundary,54.2
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+tab,pcCursor,,55
 navToCollapsedDisclosureButtonFromLastLinkDropdown,b,virtualCursor,,57
 navToCollapsedDisclosureButtonFromLastLinkDropdown,f,virtualCursor,,57.1
 navToCollapsedDisclosureButtonFromLastLinkDropdown,tab,virtualCursor,,57.2
-navToCollapsedDisclosureButtonFromLastLinkDropdown,down down,virtualCursor,,57.3
+navToCollapsedDisclosureButtonFromLastLinkDropdown,down down,virtualCursor,1:listBoundary,57.3
 navToCollapsedDisclosureButtonFromLastLinkDropdown,tab,pcCursor,,58
 dismissDropdown,esc,virtualCursor,,60
 dismissDropdown,esc,pcCursor,,61

diff --git a/tests/disclosure-navigation/data/nvda-commands.csv b/tests/disclosure-navigation/data/nvda-commands.csv
@@ -2,22 +2,22 @@ testId,command,settings,assertionExceptions,presentationNumber
 navForwardsToCollapsedDisclosureButton,b,browseMode,,1
 navForwardsToCollapsedDisclosureButton,f,browseMode,,1.1
 navForwardsToCollapsedDisclosureButton,tab,browseMode,,1.3
-navForwardsToCollapsedDisclosureButton,down,browseMode,,1.4
+navForwardsToCollapsedDisclosureButton,down,browseMode,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,1.4
 navForwardsToCollapsedDisclosureButton,tab,focusMode,,2
 navBackToCollapsedDisclosureButton,shift+b,browseMode,,4
 navBackToCollapsedDisclosureButton,shift+f,browseMode,,4.1
 navBackToCollapsedDisclosureButton,shift+tab,browseMode,,4.3
-navBackToCollapsedDisclosureButton,up,browseMode,,4.4
+navBackToCollapsedDisclosureButton,up,browseMode,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,4.4
 navBackToCollapsedDisclosureButton,shift+tab,focusMode,,5
 navForwardsToExpandedDisclosureButton,b,browseMode,,7
 navForwardsToExpandedDisclosureButton,f,browseMode,,7.1
 navForwardsToExpandedDisclosureButton,tab,browseMode,,7.2
-navForwardsToExpandedDisclosureButton,down,browseMode,,7.3
+navForwardsToExpandedDisclosureButton,down,browseMode,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,7.3
 navForwardsToExpandedDisclosureButton,tab,focusMode,,8
 navBackToExpandedDisclosureButton,shift+b,browseMode,,10
 navBackToExpandedDisclosureButton,shift+f,browseMode,,10.1
 navBackToExpandedDisclosureButton,shift+tab,browseMode,,10.2
-navBackToExpandedDisclosureButton,up,browseMode,,10.3
+navBackToExpandedDisclosureButton,up,browseMode,1:listBoundary 1:nameMythicalUniversity 1:roleNavigationLandmark,10.3
 navBackToExpandedDisclosureButton,shift+tab,focusMode,,11
 reqInfoAboutCollapsedDisclosureButton,ins+tab,browseMode,,33
 reqInfoAboutCollapsedDisclosureButton,ins+up,browseMode,,33.1
@@ -35,32 +35,26 @@ operateExpandedDisclosureButton,space,browseMode,,42
 operateExpandedDisclosureButton,enter,browseMode,,42.1
 operateExpandedDisclosureButton,space,focusMode,,43
 operateExpandedDisclosureButton,enter,focusMode,,43.1
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,u,browseMode,,45
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,k,browseMode,,45.1
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,tab,browseMode,,45.2
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,down,browseMode,,45.3
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,tab,focusMode,,46
-navFromExpandedDisclosureButtonToLinkAssociatedDropdown,down,focusMode,,46.1
 navFromExpandedDisclosureButtonToCurrentPageLink,u,browseMode,,48
 navFromExpandedDisclosureButtonToCurrentPageLink,k,browseMode,,48.1
 navFromExpandedDisclosureButtonToCurrentPageLink,tab,browseMode,,48.2
-navFromExpandedDisclosureButtonToCurrentPageLink,down,browseMode,,48.3
+navFromExpandedDisclosureButtonToCurrentPageLink,down,browseMode,1:listBoundary,48.3
 navFromExpandedDisclosureButtonToCurrentPageLink,tab,focusMode,,49
 navFromExpandedDisclosureButtonToCurrentPageLink,down,focusMode,,49.1
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+b,browseMode,,51
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+f,browseMode,,51.1
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+tab,browseMode,,51.2
-navToExpandedDisclosureButtonFromLinkAssociatedDropdown,up,browseMode,,51.3
+navToExpandedDisclosureButtonFromLinkAssociatedDropdown,up,browseMode,1:listBoundary,51.3
 navToExpandedDisclosureButtonFromLinkAssociatedDropdown,shift+tab,focusMode,,52
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+u,browseMode,,54
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+k,browseMode,,54.1
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+tab,browseMode,,54.2
-navFromCollapsedDisclosureButtonToLinkDropdown,up,browseMode,,54.3
+navFromCollapsedDisclosureButtonToLinkDropdown,up,browseMode,1:listBoundary,54.3
 navFromCollapsedDisclosureButtonToLinkDropdown,shift+tab,focusMode,,55
 navToCollapsedDisclosureButtonFromLastLinkDropdown,b,browseMode,,57
 navToCollapsedDisclosureButtonFromLastLinkDropdown,f,browseMode,,57.1
 navToCollapsedDisclosureButtonFromLastLinkDropdown,tab,browseMode,,57.2
-navToCollapsedDisclosureButtonFromLastLinkDropdown,down,browseMode,,57.3
+navToCollapsedDisclosureButtonFromLastLinkDropdown,down,browseMode,1:listBoundary,57.3
 navToCollapsedDisclosureButtonFromLastLinkDropdown,tab,focusMode,,58
 dismissDropdown,esc,browseMode,,60
 dismissDropdown,esc,focusMode,,61

diff --git a/tests/disclosure-navigation/data/references.csv b/tests/disclosure-navigation/data/references.csv
@@ -5,6 +5,7 @@ title,metadata,Disclosure Navigation Menu Example,
 reference,metadata,reference/2022-9-9_13844/disclosure-navigation.html,Test Case Page for Disclosure Navigation Menu Example
 example,metadata,https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/examples/disclosure-navigation/,APG Example: Disclosure Navigation Menu
 button,htmlAam,button,button
+heading,htmlAam,heading,heading
 list,htmlAam,list,list
 link,htmlAam,a,anchor
 nav,htmlAam,nav,nav