Skip to content

Commit 6c36ce4

Browse files
IsaDCmcking65
IsaDC
and
mcking65
authored
Radio Group Test Plans Update (#1179)
* Unhide the group label in setup scripts * Unhide the group label in setup scrips for second radio group test plan * Update NVDA commands for first radio group test plan * Add up arrow into NVDA commands for navOutStartRadioGroup * Add assertion exceptions into JAWS commands when navigating to into the start of the radio group with arro keys * Add assertion exeption into VoiceOver commands for group name when navigating into the start of the radio group * Add arrow keys into NVDA commands, update assertion exceptions for arrow keys in all screen readers. Modify setupScript descriptions * Update second radio group test plan * Remove unnecessary assertion exception from VoiceOver commands * Remove assertion exception from VoiceOver commands * Remove `aria-activedescendant` from asertions.csv * Editorial changes to commands for all screen readers * Generate .html source files with scripts automatically * Correct checkFirstRadioButtonAndSetFocusBeforeRadioGroup setupScript * Update JAWS and VoiceOver commands with an extra ctrl+opt+right and a down arrow press when navigating into a radio group * Generate .html source files with scripts automatically * Restore assertion of group name when navigating with arrow keys * Correct setFocusOnFirstRadioButton setupScript to stop it from hiding the heading * Update JAWS and VoiceOver commands for navigating out of the radio group due to the heading * Generate .html source files with scripts automatically --------- Co-authored-by: Matt King <a11yThinker@gmail.com>
1 parent 7d795b1 commit 6c36ce4

20 files changed

+34
-38
lines changed

‎tests/radiogroup-aria-activedescendant/data/jaws-commands.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
testId,command,settings,assertionExceptions,presentationNumber
22
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,f,virtualCursor,,1
33
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,a,virtualCursor,,1.1
4-
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,down down,virtualCursor,,1.2
4+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,down down down,virtualCursor,,1.2
55
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,virtualCursor,2:interactionModeEnabled,1.3
66
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,pcCursor,,1.4
77
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+f,virtualCursor,,3
@@ -11,7 +11,7 @@ navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,virtualCursor,0:nam
1111
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,pcCursor,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1,3.4
1212
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,f,virtualCursor,,5
1313
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,a,virtualCursor,,5.1
14-
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,down down,virtualCursor,,5.2
14+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,down down down,virtualCursor,,5.2
1515
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,virtualCursor,2:interactionModeEnabled,5.3
1616
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,pcCursor,,5.4
1717
NavBackIntoRadioGroupWhereLastRadioChecked,shift+f,virtualCursor,,7
@@ -20,7 +20,7 @@ NavBackIntoRadioGroupWhereLastRadioChecked,up up,virtualCursor,,7.2
2020
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,virtualCursor,2:interactionModeEnabled,7.3
2121
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,pcCursor,,7.4
2222
navOutStartRadioGroup,shift+u,virtualCursor,3:groupBoundary ,10
23-
navOutStartRadioGroup,up up,virtualCursor,,10.1
23+
navOutStartRadioGroup,up up up,virtualCursor,,10.1
2424
navOutStartRadioGroup,shift+tab,virtualCursor,3:groupBoundary ,10.2
2525
navOutStartRadioGroup,shift+tab,pcCursor,3:groupBoundary ,10.3
2626
navOutEndRadioGroup,u,virtualCursor,3:groupBoundary ,12

‎tests/radiogroup-aria-activedescendant/data/js/checkFirstRadioButtonAndSetFocusBeforeRadioGroup.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading
1+
// sets the state of the first radio button to checked, and sets focus on a link before the radio group
22
let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
33
let radios = testPageDocument.querySelectorAll('[role="radio"]');
44
radios.forEach(r => {
@@ -9,4 +9,3 @@ radios[0].classList.add('focus');
99
radios[0].setAttribute('aria-checked', 'true');
1010
radioGroup.setAttribute('aria-activedescendant', radios[0].id);
1111
testPageDocument.querySelector('#beforelink').focus();
12-
testPageDocument.querySelector('#group_label_1').style.display = 'none';

‎tests/radiogroup-aria-activedescendant/data/js/setFocusBeforeRadioGroup.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
// sets focus on a link before the radio group, and hides the group heading
1+
// sets focus on a link before the radio group
22
testPageDocument.querySelector('#beforelink').focus();
3-
testPageDocument.querySelector('#group_label_1').style.display = 'none';

‎tests/radiogroup-aria-activedescendant/data/js/setFocusOnFirstRadioButton.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ radios.forEach(r => {
77
});
88
radios[0].classList.add('focus');
99
radioGroup.setAttribute('aria-activedescendant', radios[0].id);
10-
testPageDocument.querySelector('#group_label_1').style.display = 'none';
1110
radioGroup.focus();

‎tests/radiogroup-aria-activedescendant/data/nvda-commands.csv‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
testId,command,settings,assertionExceptions,presentationNumber
22
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,f,browseMode,,1
33
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,r,browseMode,,1.1
4+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,down down,browseMode,,1.2
45
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,browseMode,2:interactionModeEnabled,1.3
56
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,focusMode,,1.4
67
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+f,browseMode,,3
78
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+r,browseMode,,3.1
9+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,up,browseMode,,3.2
810
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,browseMode,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1 2:interactionModeEnabled,3.3
911
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,focusMode,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1,3.4
1012
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,f,browseMode,,5
1113
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,r,browseMode,,5.1
14+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,down down,browseMode,,5.2
1215
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,browseMode,2:interactionModeEnabled,5.3
1316
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,focusMode,,5.4
1417
NavBackIntoRadioGroupWhereLastRadioChecked,shift+f,browseMode,,7
1518
NavBackIntoRadioGroupWhereLastRadioChecked,shift+r,browseMode,,7.1
19+
NavBackIntoRadioGroupWhereLastRadioChecked,up,browseMode,,7.2
1620
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,browseMode,2:interactionModeEnabled,7.3
1721
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,focusMode,,7.4
1822
navOutStartRadioGroup,shift+k,browseMode,3:groupBoundary ,10
19-
navOutStartRadioGroup,up,browseMode,,10.1
23+
navOutStartRadioGroup,up up,browseMode,,10.1
2024
navOutStartRadioGroup,shift+tab,browseMode,3:groupBoundary ,10.2
2125
navOutStartRadioGroup,shift+tab,focusMode,3:groupBoundary ,10.3
2226
navOutEndRadioGroup,k,browseMode,3:groupBoundary ,12

‎tests/radiogroup-aria-activedescendant/data/scripts.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
setupScript,setupScriptDescription
22
checkFirstRadioButtonAndSetFocusAfterRadioGroup,"sets the state of the first radio button to checked, and sets focus on a link after the radio group"
3-
checkFirstRadioButtonAndSetFocusBeforeRadioGroup,"sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading"
3+
checkFirstRadioButtonAndSetFocusBeforeRadioGroup,"sets the state of the first radio button to checked, and sets focus on a link before the radio group"
44
checkThirdRadioButtonAndSetFocusAfterRadioGroup,"sets the state of the third radio button to checked, and sets focus on a link after the radio group"
55
setFocusAfterRadioGroup,sets focus on a link after the radio group
6-
setFocusBeforeRadioGroup,"sets focus on a link before the radio group, and hides the group heading"
6+
setFocusBeforeRadioGroup,"sets focus on a link before the radio group"
77
setFocusOnAndCheckFirstRadioButton,"sets focus on the first radio button, and sets its state to checked"
88
setFocusOnFirstRadioButton,sets focus on the first radio button
99
setFocusOnFirstRadioButtonAndCheckSecondRadioButton,"sets focus on the first radio button, and checks the second radio button"

‎tests/radiogroup-aria-activedescendant/data/voiceover_macos-commands.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
testId,command,settings,assertionExceptions,presentationNumber
2-
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,ctrl+opt+right ctrl+opt+right,,,2
2+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,ctrl+opt+right ctrl+opt+right ctrl+opt+right,,,2
33
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,,,2.1
44
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,j,singleQuickKeyNavOn,,2.2
55
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,ctrl+opt+left ctrl+opt+left,,,4
66
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+j,singleQuickKeyNavOn,,4.1
77
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1,4.2
8-
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,ctrl+opt+right ctrl+opt+right,,,6
8+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,ctrl+opt+right ctrl+opt+right ctrl+opt+right,,,6
99
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,,,6.1
1010
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,j,singleQuickKeyNavOn,,6.2
1111
NavBackIntoRadioGroupWhereLastRadioChecked,ctrl+opt+left ctrl+opt+left,,,8
1212
NavBackIntoRadioGroupWhereLastRadioChecked,shift+j,singleQuickKeyNavOn,,8.1
1313
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,,,8.2
14-
navOutStartRadioGroup,ctrl+opt+left ctrl+opt+left,,,10
14+
navOutStartRadioGroup,ctrl+opt+left ctrl+opt+left ctrl+opt+left,,,10
1515
navOutStartRadioGroup,shift+tab,,3:groupBoundary ,10.1
1616
navOutStartRadioGroup,shift+l,singleQuickKeyNavOn,3:groupBoundary ,10.2
1717
navOutEndRadioGroup,ctrl+opt+right ctrl+opt+right,,,12

‎tests/radiogroup-aria-activedescendant/reference/2022-4-7_113015/radio-activedescendant.checkFirstRadioButtonAndSetFocusBeforeRadioGroup.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
(function() {
1414
function setupScript(testPageDocument) {
1515
// checkFirstRadioButtonAndSetFocusBeforeRadioGroup
16-
// sets the state of the first radio button to checked, sets focus on a link before the radio group, and hides the group heading
16+
// sets the state of the first radio button to checked, and sets focus on a link before the radio group
1717
let radioGroup = testPageDocument.querySelector('[role="radiogroup"]');
1818
let radios = testPageDocument.querySelectorAll('[role="radio"]');
1919
radios.forEach(r => {
@@ -24,7 +24,6 @@
2424
radios[0].setAttribute('aria-checked', 'true');
2525
radioGroup.setAttribute('aria-activedescendant', radios[0].id);
2626
testPageDocument.querySelector('#beforelink').focus();
27-
testPageDocument.querySelector('#group_label_1').style.display = 'none';
2827

2928
};
3029
document.addEventListener('click', function(event) {

‎tests/radiogroup-aria-activedescendant/reference/2022-4-7_113015/radio-activedescendant.setFocusBeforeRadioGroup.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
(function() {
1414
function setupScript(testPageDocument) {
1515
// setFocusBeforeRadioGroup
16-
// sets focus on a link before the radio group, and hides the group heading
16+
// sets focus on a link before the radio group
1717
testPageDocument.querySelector('#beforelink').focus();
18-
testPageDocument.querySelector('#group_label_1').style.display = 'none';
1918

2019
};
2120
document.addEventListener('click', function(event) {

‎tests/radiogroup-aria-activedescendant/reference/2022-4-7_113015/radio-activedescendant.setFocusOnFirstRadioButton.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
});
2323
radios[0].classList.add('focus');
2424
radioGroup.setAttribute('aria-activedescendant', radios[0].id);
25-
testPageDocument.querySelector('#group_label_1').style.display = 'none';
2625
radioGroup.focus();
2726

2827
};

0 commit comments

Comments
 (0)