diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2024-04-08 16:32:21 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@qt.io> | 2024-04-10 20:30:44 +0000 |
| commit | 8e1ee06e176fe8cdb624828577d0dae236897ea6 (patch) | |
| tree | 3e1702588f201be426d3b056dcde707eeb9040be | |
| parent | 3829ddf5caeca01ad9a999d722f0e36ae877c94d (diff) | |
Squish: Move OK button to globalnames
...so it can be used anywhere.
Change-Id: I0790e893363c91512fb75c5494f041d958b8c0a7
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | Tests/system/shared/globalnames.py | 2 | ||||
| -rw-r--r-- | Tests/system/suite_configuration/shared/scripts/names.py | 2 | ||||
| -rw-r--r-- | Tests/system/suite_configuration/tst_add_remove_qt_versions/test.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Tests/system/shared/globalnames.py b/Tests/system/shared/globalnames.py index d7050dbd..05851332 100644 --- a/Tests/system/shared/globalnames.py +++ b/Tests/system/shared/globalnames.py @@ -23,3 +23,5 @@ pART_Popup_Project_MenuItem = {"text": "Project...", "type": "MenuItem"} msvs_Account_Settings_Window = {"text": "Microsoft Visual Studio Account Settings", "type": "Window"} msvs_Account_Close_Button = {"container": msvs_Account_Settings_Window, "text": "Close", "type": "Button"} microsoft_Visual_Studio_Dialog = {"text": "Microsoft Visual Studio", "type": "Dialog"} +microsoft_Visual_Studio_OK_Button = {"container": microsoft_Visual_Studio_Dialog, + "text": "OK", "type": "Button"} diff --git a/Tests/system/suite_configuration/shared/scripts/names.py b/Tests/system/suite_configuration/shared/scripts/names.py index f98732a4..8e125126 100644 --- a/Tests/system/suite_configuration/shared/scripts/names.py +++ b/Tests/system/suite_configuration/shared/scripts/names.py @@ -72,7 +72,5 @@ file_Close_Folder_MenuItem = {"container": globalnames.file_MenuItem, "text": "C selectStartupItemButton = {"tooltip": RegularExpression("^(Local Windows Debugger|Select Startup Item)$"), "type": "Button"} selectStartupItemLabel = {"container": selectStartupItemButton, "type": "Label"} -microsoft_Visual_Studio_OK_Button = {"container": globalnames.microsoft_Visual_Studio_Dialog, - "text": "OK", "type": "Button"} msvs_Qt_VS_Tools_Invalid_Qt_versions = {"container": globalnames.microsoft_Visual_Studio_Dialog, "id": "65535", "type": "Label"} diff --git a/Tests/system/suite_configuration/tst_add_remove_qt_versions/test.py b/Tests/system/suite_configuration/tst_add_remove_qt_versions/test.py index 3ca345da..3944a716 100644 --- a/Tests/system/suite_configuration/tst_add_remove_qt_versions/test.py +++ b/Tests/system/suite_configuration/tst_add_remove_qt_versions/test.py @@ -57,7 +57,7 @@ def main(): dialogText = waitForObjectExists(names.msvs_Qt_VS_Tools_Invalid_Qt_versions).text test.verify(("Name cannot be empty" in dialogText) ^ nameEntered) test.verify("Cannot find qmake.exe" in dialogText) - clickButton(waitForObject(names.microsoft_Visual_Studio_OK_Button)) + clickButton(waitForObject(globalnames.microsoft_Visual_Studio_OK_Button)) nonExistingDir = "C:\\this\does\\not\\exist" while os.path.exists(nonExistingDir): |