Squish: Update tst_git_first_commit and tst_git_local

Change-Id: I5e7a1c3be4fe7fab848c98abdf52d3b9af318047
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

tests/system/shared/project.py

@@ -113,7 +113,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True, lib
                                   "toolTip?='Full path: *'}")
     replaceEditorContent(directoryEdit, path)
     projectNameEdit = waitForObject("{name='nameLineEdit' visible='1' "
-                                    "type='Utils::ProjectNameValidatingLineEdit'}")
+                                    "type='Utils::FancyLineEdit'}")
     if projectName == None:
         projectName = projectNameEdit.text
     else:

tests/system/suite_tools/tst_git_first_commit/test.py

@@ -65,5 +65,9 @@ def main():
     changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
     waitFor("len(str(changedEdit.plainText)) > 0 and "
             "str(changedEdit.plainText) != 'Waiting for data...'", 20000)
-    test.xverify(str(changedEdit.plainText) != "No difference", "Does Creator show actual changes?")
+    diffPlainText = str(changedEdit.plainText)
+    test.verify("# This file is used to ignore files which are generated" in diffPlainText,
+                "Comment from .gitignore in diff?")
+    test.verify("SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);"
+                in diffPlainText, "main function in diff?")
     invokeMenuItem("File", "Exit")

tests/system/suite_tools/tst_git_local/test.py

@@ -57,7 +57,7 @@ def commit(commitMessage, expectedLogMessage, uncheckUntracked=False):
 
 def verifyItemsInGit(commitMessages):
     gitEditor = waitForObject(":Qt Creator_Git::Internal::GitEditor")
-    waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Waiting for data...'", 20000)
+    waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Working...'", 20000)
     plainText = str(gitEditor.plainText)
     verifyItemOrder(commitMessages, plainText)
     return plainText