Merge 31fd31f into 26439b1

CyrilleB79 · web-flow · commit 6435cdd4c931 · 2022-09-15T00:01:20.000+10:00
diff --git a/tests/system/libraries/ChromeLib.py b/tests/system/libraries/ChromeLib.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2020-2021 NV Access Limited
+# Copyright (C) 2020-2022 NV Access Limited, Cyrille Bougot
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,7 @@ def start_chrome(self, filePath: str, testCase: str) -> Window:
 			" --disable-notifications"
 			" --no-experiments"
 			" --no-default-browser-check"
+			" --lang=en-US"
 			f' "{filePath}"',
 			shell=True,
 			alias='chromeStartAlias',
@@ -141,7 +142,7 @@ def _writeTestFile(testCase) -> str:
 			<head>
 				<title>{ChromeLib.getUniqueTestCaseTitle(testCase)}</title>
 			</head>
-			<body onload="document.getElementById('loadStatus').innerHTML='{ChromeLib._loadCompleteString}'">
+			<body lang="en" onload="document.getElementById('loadStatus').innerHTML='{ChromeLib._loadCompleteString}'">
 				<p>{ChromeLib._beforeMarker}</p>
 				<p id="loadStatus">Loading...</p>
 				{testCase}
diff --git a/tests/system/nvdaSettingsFiles/standard-doShowWelcomeDialog.ini b/tests/system/nvdaSettingsFiles/standard-doShowWelcomeDialog.ini
@@ -1,5 +1,6 @@
 schemaVersion = 2
 [general]
+	language = en
 	showWelcomeDialogAtStartup = True
 [update]
 	askedAllowUsageStats = True
diff --git a/tests/system/nvdaSettingsFiles/standard-dontShowExitDialog.ini b/tests/system/nvdaSettingsFiles/standard-dontShowExitDialog.ini
@@ -1,5 +1,6 @@
 schemaVersion = 2
 [general]
+	language = en
 	showWelcomeDialogAtStartup = True
 	askToExit = False
 [update]
diff --git a/tests/system/nvdaSettingsFiles/standard-dontShowWelcomeDialog.ini b/tests/system/nvdaSettingsFiles/standard-dontShowWelcomeDialog.ini
@@ -1,5 +1,6 @@
 schemaVersion = 2
 [general]
+	language = en
 	showWelcomeDialogAtStartup = False
 [update]
 	askedAllowUsageStats = True
diff --git a/tests/system/readme.md b/tests/system/readme.md
@@ -25,7 +25,9 @@ E.G. to run all tests with the chrome tag use:
 runsystemtests -i "chrome" ...
 ```
 
-Other options exit for specifying tests to run (e.g. by suite, tag, etc).
+Note: For tests based on Chrome, be sure that no previous instance of Chrome is open when you launch the test, specifically on non-English systems.
+
+Other options exist for specifying tests to run (e.g. by suite, tag, etc).
 Consult `runsystemtests --help`
 
 ### Tags are required
diff --git a/tests/system/robot/chromeTests.py b/tests/system/robot/chromeTests.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2020-2021 NV Access Limited, Leonard de Ruijter
+# Copyright (C) 2020-2022 NV Access Limited, Leonard de Ruijter, Cyrille Bougot
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -57,7 +57,7 @@ def checkbox_labelled_by_inner_element():
 
 REVIEW_CURSOR_FOLLOW_CARET_KEY = ["reviewCursor", "followCaret"]
 REVIEW_CURSOR_FOLLOW_FOCUS_KEY = ["reviewCursor", "followFocus"]
-READ_DETAILS_GESTURE = "NVDA+\\"  # see chrome-gestures.ini
+READ_DETAILS_GESTURE = "NVDA+d"
 
 
 def _getNoVBuf_AriaDetails_sample() -> str:
diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2019 NV Access Limited
+# Copyright (C) 2019-2022 NV Access Limited, Cyrille Bougot
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 *** Settings ***
@@ -24,7 +24,7 @@ default teardown
 	quit NVDA
 
 default setup
-	start NVDA	standard-dontShowWelcomeDialog.ini	chrome-gestures.ini
+	start NVDA	standard-dontShowWelcomeDialog.ini
 	enable_verbose_debug_logging_if_requested
 
 *** Test Cases ***
