diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index e8ee09bda9d..8669875a61a 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -79,13 +79,17 @@ def openCmakeProject(projectPath, buildDir): # this list can be used in __chooseTargets__() def __createProjectOrFileSelectType__(category, template, fromWelcome = False, isProject=True): if fromWelcome: + if not isProject: + test.fatal("'New' on Welcome screen only handles projects nowadays.") wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton("New") if not all((wsButtonFrame, wsButtonLabel)): test.fatal("Could not find 'New' button on Welcome Page") return [] mouseClick(wsButtonLabel) + elif isProject: + invokeMenuItem("File", "New Project...") else: - invokeMenuItem("File", "New File or Project...") + invokeMenuItem("File", "New File...") categoriesView = waitForObject(":New.templateCategoryView_QTreeView") if isProject: mouseClick(waitForObjectItem(categoriesView, "Projects." + category)) diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py index 8bfdd77b2f3..d0fd4a643e8 100644 --- a/tests/system/suite_editors/tst_edit_externally/test.py +++ b/tests/system/suite_editors/tst_edit_externally/test.py @@ -69,7 +69,7 @@ def main(): clickButton(waitForObject("{text='Yes' type='QPushButton' window=%s}" % mBox)) else: # modify the current and the former file after AUT had lost focus and use 'Yes to All' - invokeMenuItem("File", "New File or Project...") + invokeMenuItem("File", "New Project...") modifyExternally(currentFile) modifyExternally(files[i - 1]) # clicking Cancel does not work when running inside Squish - mBox would not come up diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index dd1397f3c1e..bbcc742a662 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -39,7 +39,7 @@ def main(): kits = getConfiguredKits() test.log("Collecting potential project types...") availableProjectTypes = [] - invokeMenuItem("File", "New File or Project...") + invokeMenuItem("File", "New Project...") categoriesView = waitForObject(":New.templateCategoryView_QTreeView") catModel = categoriesView.model() projects = catModel.index(0, 0) @@ -146,7 +146,7 @@ def __createProject__(category, template): except: return "" - invokeMenuItem("File", "New File or Project...") + invokeMenuItem("File", "New Project...") selectFromCombo(waitForObject(":New.comboBox_QComboBox"), "All Templates") categoriesView = waitForObject(":New.templateCategoryView_QTreeView") mouseClick(waitForObjectItem(categoriesView, "Projects." + category))