diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-11-28 15:29:37 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-11-30 13:20:44 +0000 |
| commit | 09f0d1a2ca0deb7606dcc51e0aa787fdad36441e (patch) | |
| tree | 2e9f9d0eca4594bd682a4c46857177dbee4a0b6a | |
| parent | edcce9c1f3d0bb26002a0d8ab8e21103a1ad3102 (diff) | |
Squish: Stabilize tst_HELP05
Change-Id: I9296dc577fac4ea06c7c8f482a44948ba327568f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | tests/system/shared/utils.py | 17 | ||||
| -rwxr-xr-x | tests/system/suite_HELP/tst_HELP05/test.py | 1 | ||||
| -rwxr-xr-x | tests/system/suite_WELP/tst_WELP01/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP03/test.py | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index b331ddb667..e9209177eb 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -544,13 +544,24 @@ def iterateKits(keepOptionsOpen=False, alreadyOnOptionsDialog=False, else: return result -# set "Always Start Full Help" in "Tools" -> "Options..." -> "Help" -> "General" -def setAlwaysStartFullHelp(): +# set a help viewer that will always be used, regardless of Creator's width + +class HelpViewer: + HELPMODE, SIDEBYSIDE, EXTERNALWINDOW = range(3) + +def setFixedHelpViewer(helpViewer): invokeMenuItem("Tools", "Options...") waitForObjectItem(":Options_QListView", "Help") clickItem(":Options_QListView", "Help", 5, 5, 0, Qt.LeftButton) clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "General") - selectFromCombo(":Startup.contextHelpComboBox_QComboBox", "Always Show in Help Mode") + mode = "Always Show " + if helpViewer == HelpViewer.HELPMODE: + mode += "in Help Mode" + elif helpViewer == HelpViewer.SIDEBYSIDE: + mode += "Side-by-Side" + elif helpViewer == HelpViewer.EXTERNALWINDOW: + mode += "in External Window" + selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode) clickButton(waitForObject(":Options.OK_QPushButton")) def removePackagingDirectory(projectPath): diff --git a/tests/system/suite_HELP/tst_HELP05/test.py b/tests/system/suite_HELP/tst_HELP05/test.py index 2b84e6d7af..82d337063e 100755 --- a/tests/system/suite_HELP/tst_HELP05/test.py +++ b/tests/system/suite_HELP/tst_HELP05/test.py @@ -52,6 +52,7 @@ def main(): for p in Qt5Path.getPaths(Qt5Path.DOCS): qchs.append(os.path.join(p, "qtquick.qch")) addHelpDocumentation(qchs) + setFixedHelpViewer(HelpViewer.SIDEBYSIDE) # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") editorArea = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index acbc5bc5cc..f13a29bcce 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -79,7 +79,7 @@ def main(): if not startedWithoutPluginError(): return - setAlwaysStartFullHelp() + setFixedHelpViewer(HelpViewer.HELPMODE) addCurrentCreatorDocumentation() buttonsAndState = {'Projects':True, 'Examples':False, 'Tutorials':False} diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 8b211d606d..3347f34f37 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -66,7 +66,7 @@ def main(): for p in Qt5Path.getPaths(Qt5Path.DOCS): qchs.extend([os.path.join(p, "qtopengl.qch"), os.path.join(p, "qtwidgets.qch")]) addHelpDocumentation(qchs) - setAlwaysStartFullHelp() + setFixedHelpViewer(HelpViewer.HELPMODE) wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Get Started Now') if not test.verify(all((wsButtonFrame, wsButtonLabel)), "Verifying: Qt Creator displays Welcome Page with Getting Started."): |