Skip to content

Commit 92d26ca

Browse files
seanbuddseanbudd
authored
Merge 24abdde into 3ac42fe 
2 parents 3ac42fe + 24abdde commit 92d26ca

9 files changed

Lines changed: 35 additions & 22 deletions

File tree

‎include/detours‎

‎include/ia2‎

‎include/sonic‎

‎include/w3c-aria-practices‎

Submodule w3c-aria-practices updated 487 files

‎include/wil‎

Submodule wil updated 72 files

‎projectDocs/dev/createDevEnvironment.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,22 @@ If you aren't sure, run `git submodule update` after every git pull, merge or ch
6565
For reference, the following run time dependencies are included in Git submodules:
6666

6767
* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `ed9a7bcf`
68-
* [Sonic](https://github.com/waywardgeek/sonic), commit 1d705135
69-
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit cbc1f29631780
68+
* [Sonic](https://github.com/waywardgeek/sonic), commit `8694c596378c24e340c09ff2cd47c065494233f1`
69+
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit `3d8c7f0b833453f761ded6b12d8be431507bfe0b`
7070
* [liblouis](http://www.liblouis.io/), version 3.27.0
7171
* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/), version 42.0
7272
* NVDA images and sounds
7373
* [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)
74-
* [Microsoft Detours](https://github.com/microsoft/Detours), commit 45a76a3
75-
* brlapi Python bindings, version 0.8 or later, distributed with [BRLTTY for Windows](https://brltty.app/download.html), version 6.1
74+
* [Microsoft Detours](https://github.com/microsoft/Detours), commit `4b8c659f549b0ab21cf649377c7a84eb708f5e68`
75+
* brlapi Python bindings, version 0.8.5 or later, distributed with [BRLTTY for Windows](https://brltty.app/download.html), version 6.6
7676
* lilli.dll, version 2.1.0.0
7777
* [Python interface to FTDI driver/chip](http://fluidmotion.dyndns.org/zenphoto/index.php?p=news&title=Python-interface-to-FTDI-driver-chip)
7878
* [Nullsoft Install System](https://nsis.sourceforge.io), version 3.08
79-
* Java Access Bridge 32 bit, from Zulu Community OpenJDK build 13.0.1+10Zulu (13.28.11)
79+
* [Java Access Bridge 32 bit, from Zulu Community OpenJDK build 13.0.1+10Zulu (13.28.11)](https://github.com/nvaccess/javaAccessBridge32-bin)
80+
* [wil](https://github.com/microsoft/wil/)
8081
* [Microsoft UI Automation Remote Operations Library, forked from @microsoft by @michaeldcurran](https://www.github.com/michaeldcurran/microsoft-ui-uiautomation/)
8182
* Commit 224b22f3bf9e
82-
* The fork specifically adds support for CallExtension / IsExtensionSupported to the high-level API, see pr microsoft/microsoft-ui-uiautomation#84.
83+
* The fork specifically adds support for CallExtension / IsExtensionSupported to the high-level API, see pr microsoft/microsoft-ui-uiautomation#84 and #95.
8384

8485
Additionally, the following build time dependencies are included in the miscDeps git submodule:
8586

‎tests/system/robot/chromeTests.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
#: single space is used to separate semantics in braille output.
3535
BRAILLE_SEP = " "
3636

37-
ARIAExamplesDir = os.path.join(
38-
_NvdaLib._locations.repoRoot, "include", "w3c-aria-practices", "examples"
37+
ARIAPatternsDir = os.path.join(
38+
_NvdaLib._locations.repoRoot,
39+
"include",
40+
"w3c-aria-practices",
41+
"content",
42+
"patterns",
3943
)
4044

4145

@@ -894,7 +898,7 @@ def test_ariaTreeGrid_browseMode():
894898
"""
895899
Ensure that ARIA treegrids are accessible as a standard table in browse mode.
896900
"""
897-
testFile = os.path.join(ARIAExamplesDir, "treegrid", "treegrid-1.html")
901+
testFile = os.path.join(ARIAPatternsDir, "treegrid", "examples", "treegrid-1.html")
898902
_chrome.prepareChrome(
899903
f"""
900904
<iframe src="{testFile}"></iframe>
@@ -913,7 +917,7 @@ def test_ariaTreeGrid_browseMode():
913917
actualSpeech = _chrome.getSpeechAfterKey("tab")
914918
_asserts.strings_match(
915919
actualSpeech,
916-
"issue 790. link"
920+
"Treegrid Pattern link"
917921
)
918922
# Jump to the ARIA treegrid with the next table quicknav command.
919923
# The browse mode caret will be inside the table on the caption before the first row.
@@ -991,7 +995,7 @@ def test_ariaCheckbox_browseMode():
991995
"""
992996
Navigate to an unchecked checkbox in reading mode.
993997
"""
994-
testFile = os.path.join(ARIAExamplesDir, "checkbox", "checkbox.html")
998+
testFile = os.path.join(ARIAPatternsDir, "checkbox", "examples", "checkbox.html")
995999
_chrome.prepareChrome(
9961000
f"""
9971001
<iframe src="{testFile}"></iframe>
@@ -2234,7 +2238,7 @@ def test_i10890():
22342238
# Chrome sometimes exposes tables as clickable, sometimes not.
22352239
# This test does not need to know, so disable reporting of clickables.
22362240
spy.set_configValue(["documentFormatting", "reportClickable"], False)
2237-
testFile = os.path.join(ARIAExamplesDir, "grid", "datagrids.html")
2241+
testFile = os.path.join(ARIAPatternsDir, "grid", "examples", "data-grids.html")
22382242
_chrome.prepareChrome(
22392243
f"""
22402244
<iframe src="{testFile}"></iframe>
@@ -2279,13 +2283,14 @@ def test_ARIASwitchRole():
22792283
"""
22802284
Ensure that ARIA switch controls have an appropriate role and states in browse mode.
22812285
"""
2282-
testFile = os.path.join(ARIAExamplesDir, "switch", "switch.html")
2286+
testFile = os.path.join(ARIAPatternsDir, "switch", "examples", "switch.html")
22832287
_chrome.prepareChrome(
22842288
f"""
22852289
<iframe src="{testFile}"></iframe>
22862290
"""
22872291
)
2288-
# Jump to the first heading 2 in the iframe.
2292+
# Jump to the second heading 2 in the iframe.
2293+
_chrome.getSpeechAfterKey("2")
22892294
actualSpeech = _chrome.getSpeechAfterKey("2")
22902295
_asserts.strings_match(
22912296
actualSpeech,

‎tests/system/robot/chromeTests.robot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# For more details see: https://www.gnu.org/licenses/gpl-2.0.html
55
*** Settings ***
66
Documentation HTML test cases in Chrome
7-
Force Tags NVDA smoke test browser chrome excluded_from_build
7+
Force Tags NVDA smoke test browser chrome
88
99
# for start & quit in Test Setup and Test Test Teardown
1010
Library NvdaLib.py

‎user_docs/en/changes.t2t‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ Add-ons will need to be re-tested and have their manifest updated.
5656
- The ``BrailleDisplayDriver`` base class now has ``numRows`` and ``numCols`` properties to provide information about multi line braille displays.
5757
Setting ``numCells`` is still supported for single line braille displays and ``numCells`` will return the total number of cells for multi line braille displays. (#15386)
5858
- Updated BrlAPI for BRLTTY to version 0.8.5, and its corresponding python module to a Python 3.11 compatible build. (#15652, @LeonarddeR)
59+
- Updated ``include`` dependencies:
60+
- detours to ``4b8c659f549b0ab21cf649377c7a84eb708f5e68``. (#15695)
61+
- ia2 to ``3d8c7f0b833453f761ded6b12d8be431507bfe0b``. (#15695)
62+
- sonic to ``8694c596378c24e340c09ff2cd47c065494233f1``. (#15695)
63+
- w3c-aria-practices to ``9a5e55ccbeb0f1bf92b6127c9865da8426d1c864``. (#15695)
64+
- wil to ``5e9be7b2d2fe3834a7107f430f7d4c0631f69833``. (#15695)
65+
-
5966
-
6067

6168
=== API Breaking Changes ===
@@ -64,11 +71,11 @@ Please open a GitHub issue if your Add-on has an issue with updating to the new
6471

6572
- NVDA is now built with Python 3.11. (#12064)
6673
- Updated pip dependencies:
67-
- configobj to 5.1.0dev commit e2ba4457. (#15544)
74+
- configobj to 5.1.0dev commit ``e2ba4457c4651fa54f8d59d8dcdd3da950e956b8``. (#15544)
6875
- Comtypes to 1.2.0. (#15513, @codeofdusk)
6976
- fast_diff_match_patch to 2.0.1. (#15514, @codeofdusk)
7077
- Flake8 to 4.0.1. (#15636, @lukaszgo1)
71-
- py2exe to 0.13.0.1dev commit 4e7b2b2c60face592e67cb1bc935172a20fa371d. (#15544)
78+
- py2exe to 0.13.0.1dev commit ``4e7b2b2c60face592e67cb1bc935172a20fa371d``. (#15544)
7279
- robotframework to 6.1.1. (#15544)
7380
- SCons to 4.5.2. (#15529)
7481
- sphinx to 7.2.6. (#15544)

0 commit comments

Comments
 (0)