Make tests not depend on minimal project settings

tests/test_gui/test_gui_guimain.py

@@ -23,7 +23,7 @@ import os
 import pytest
 
 from shutil import copyfile
-from tools import cmpFiles
+from tools import cmpFiles, buildTestProject
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QMessageBox, QDialog
@@ -76,9 +76,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     """
     monkeypatch.setattr(QMessageBox, "question", lambda *a: QMessageBox.Yes)
 
-    assert nwGUI.newProject({"projPath": fncProj}) is True
-    assert nwGUI.saveProject() is True
-    # assert False
+    buildTestProject(nwGUI, fncProj)
 
     sHandle = "000000000000f"
     assert nwGUI.openSelectedItem() is False
@@ -139,7 +137,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     monkeypatch.setattr(GuiDocEditor, "hasFocus", lambda *a: True)
 
     # Create new, save, close project
-    assert nwGUI.newProject({"projPath": fncProj})
+    buildTestProject(nwGUI, fncProj)
     assert nwGUI.saveProject()
     assert nwGUI.closeProject()
 
@@ -178,9 +176,9 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     assert nwGUI.theProject.projMeta == os.path.join(fncProj, "meta")
     assert nwGUI.theProject.projFile == "nwProject.nwx"
     assert nwGUI.theProject.projName == "New Project"
-    assert nwGUI.theProject.bookTitle == ""
-    assert len(nwGUI.theProject.bookAuthors) == 0
-    assert not nwGUI.theProject.spellCheck
+    assert nwGUI.theProject.bookTitle == "New Novel"
+    assert len(nwGUI.theProject.bookAuthors) == 1
+    assert nwGUI.theProject.spellCheck is False
 
     # Check that tree items have been created
     assert nwGUI.treeView._getTreeItem("0000000000008") is not None

tests/test_gui/test_gui_mainmenu.py

@@ -26,7 +26,7 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QTextCursor, QTextBlock
 from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox
 
-from tools import writeFile
+from tools import writeFile, buildTestProject
 
 from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.enum import nwDocAction, nwDocInsert
@@ -465,7 +465,7 @@ def testGuiMenu_Insert(qtbot, monkeypatch, nwGUI, fncDir, fncProj, mockRnd):
     monkeypatch.setattr(QMessageBox, "question", lambda *a: QMessageBox.Yes)
     monkeypatch.setattr(QMessageBox, "critical", lambda *a: QMessageBox.Yes)
 
-    assert nwGUI.newProject({"projPath": fncProj})
+    buildTestProject(nwGUI, fncProj)
 
     assert nwGUI.treeView._getTreeItem("000000000000f") is not None
     assert nwGUI.openDocument("000000000000f") is True

tests/test_gui/test_gui_projtree.py

@@ -22,6 +22,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 import pytest
 import os
 
+from tools import buildTestProject
+
 from PyQt5.QtWidgets import QAction, QMessageBox
 
 from novelwriter.guimain import GuiMain
@@ -47,7 +49,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
 
     # Create a project
     prjDir = os.path.join(fncDir, "project")
-    assert nwGUI.newProject({"projPath": prjDir}) is True
+    buildTestProject(nwGUI, prjDir)
 
     # No itemType set
     nwTree.clearSelection()
@@ -155,7 +157,7 @@ def testGuiProjTree_MoveItems(qtbot, monkeypatch, nwGUI, fncDir, mockRnd):
 
     # Create a project
     prjDir = os.path.join(fncDir, "project")
-    assert nwGUI.newProject({"projPath": prjDir}) is True
+    buildTestProject(nwGUI, prjDir)
 
     # Move Documents
     # ==============
@@ -283,7 +285,7 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
 
     # Create a project
     prjDir = os.path.join(fncDir, "project")
-    assert nwGUI.newProject({"projPath": prjDir}) is True
+    buildTestProject(nwGUI, prjDir)
 
     # Try emptying the trash already now, when there is no trash folder
     assert nwTree.emptyTrash() is False

tests/test_gui/test_gui_statusbar.py

@@ -22,6 +22,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 import time
 import pytest
 
+from tools import buildTestProject
+
 from PyQt5.QtWidgets import QMessageBox
 
 from novelwriter.core import NWDoc
@@ -34,7 +36,7 @@ def testGuiStatusBar_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     """
     monkeypatch.setattr(QMessageBox, "question", lambda *a: QMessageBox.Yes)
 
-    assert nwGUI.newProject({"projPath": fncProj}) is True
+    buildTestProject(nwGUI, fncProj)
     cHandle = nwGUI.theProject.newFile("A Note", "000000000000a")
     newDoc = NWDoc(nwGUI.theProject, cHandle)
     newDoc.writeDocument("# A Note\n\n")
@@ -89,10 +91,10 @@ def testGuiStatusBar_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     # Project Stats
     nwGUI.statusBar.mainConf.incNotesWCount = False
     nwGUI._updateStatusWordCount()
-    assert nwGUI.statusBar.statsText.text() == "Words: 6 (+6)"
+    assert nwGUI.statusBar.statsText.text() == "Words: 9 (+9)"
     nwGUI.statusBar.mainConf.incNotesWCount = True
     nwGUI._updateStatusWordCount()
-    assert nwGUI.statusBar.statsText.text() == "Words: 8 (+8)"
+    assert nwGUI.statusBar.statsText.text() == "Words: 11 (+11)"
 
     # qtbot.stopForInteraction()