From b3814184760c3279047512bb5673c06b3b71073e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 6 Sep 2017 08:55:03 +0200 Subject: [PATCH] Welcome: Squish: Assign object name to fix Squish tests Latest change of adding QScrollArea around Welcome's sidebar made the objects lookup fragile. Using the QScrollArea inside Squish tests helped for some but not all lookups. Simplify the lookup by assigning an object name. Change-Id: I5f37ee69bf20eaf02c9717cbaa5ba541d8ffbc17 Reviewed-by: Alessandro Portale --- src/plugins/welcome/welcomeplugin.cpp | 1 + tests/system/shared/welcome.py | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 72823240ae3..d0bde8e9946 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -303,6 +303,7 @@ WelcomeMode::WelcomeMode() divider->setPalette(themeColor(Theme::Welcome_DividerColor)); m_pageStack = new QStackedWidget(m_modeWidget); + m_pageStack->setObjectName("WelcomeScreenStackedWidget"); m_pageStack->setAutoFillBackground(true); auto hbox = new QHBoxLayout; diff --git a/tests/system/shared/welcome.py b/tests/system/shared/welcome.py index 406f379e030..0d6d446f6b3 100644 --- a/tests/system/shared/welcome.py +++ b/tests/system/shared/welcome.py @@ -37,10 +37,8 @@ def getWelcomeScreenSideBarButton(buttonLabel): return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar) def getWelcomeScreenMainButton(buttonLabel): - stackedWidget = waitForObject("{type='QWidget' unnamed='1' visible='1' " - "leftWidget={type='QWidget' unnamed='1' visible='1' " - "leftWidget={type='Welcome::Internal::SideBar' unnamed='1' " - "window=':Qt Creator_Core::Internal::MainWindow'}}}") + stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' " + "window=':Qt Creator_Core::Internal::MainWindow'}") currentStackWidget = stackedWidget.currentWidget() return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)