From d93af8c90f133354cffd65bfffc4d23f9e60a14c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 3 Aug 2017 15:21:05 +0200 Subject: [PATCH] Squish: Add special menu handling for macOS When sub menus are going to get triggered the mouse interaction done by Squish might close the sub menu with the mouse click - avoid this by explicitly setting the mouse cursor onto the item before clicking it. Change-Id: Id2afe9823304caac1bd66a423fe4a0ee12993ddd Reviewed-by: Robert Loehning --- tests/system/shared/editor_utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 32200de0400..51b2fdf4d91 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -344,7 +344,10 @@ def validateSearchResult(expectedCount): def invokeContextMenuItem(editorArea, command1, command2 = None): ctxtMenu = openContextMenuOnTextCursorPosition(editorArea) snooze(1) - activateItem(waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000)) + item1 = waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000) + if command2 and platform.system() == 'Darwin': + mouseMove(item1) + activateItem(item1) if command2: activateItem(waitForObjectItem("{title='%s' type='QMenu' visible='1' window=%s}" % (command1, objectMap.realName(ctxtMenu)), command2, 2000))