Change lastPath to a Path object

tests/test_tools/test_tools_build.py

@@ -23,6 +23,8 @@ import pytest
 import os
 
 from shutil import copyfile
+from pathlib import Path
+
 from tools import cmpFiles, getGuiItem
 
 from PyQt5.QtCore import Qt
@@ -61,21 +63,13 @@ def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
     # Invalid file format
     assert not nwBuild._saveDocument(-1)
 
-    # Non-existent path
-    with monkeypatch.context() as mp:
-        mp.setattr("os.path.expanduser", lambda *a, **k: nwLipsum)
-        assert nwGUI.mainConf.lastPath != nwLipsum
-        nwGUI.mainConf.lastPath = "no_such_path"
-        assert nwBuild._saveDocument(nwBuild.FMT_NWD)
-        assert nwGUI.mainConf.lastPath == nwLipsum
-
     # No path selected
     with monkeypatch.context() as mp:
         mp.setattr(QFileDialog, "getSaveFileName", lambda *a, **k: ("", ""))
         assert not nwBuild._saveDocument(nwBuild.FMT_NWD)
 
     # Default Settings
-    nwGUI.mainConf.lastPath = nwLipsum
+    nwGUI.mainConf._lastPath = Path(nwLipsum)
     qtbot.mouseClick(nwBuild.buildNovel, Qt.LeftButton)
 
     assert nwBuild._saveDocument(nwBuild.FMT_NWD)

tests/test_tools/test_tools_projwizard.py

@@ -67,7 +67,6 @@ def testToolProjectWizard_Handling(qtbot, monkeypatch, nwGUI, fncProj):
     # Test the Wizard Launching
     # =========================
 
-    nwGUI.mainConf.lastPath = " "
     monkeypatch.setattr(GuiProjectWizard, "exec_", lambda *a: None)
 
     result = nwGUI.showNewProjectDialog()
@@ -102,7 +101,6 @@ def testToolProjectWizard_Run(qtbot, monkeypatch, nwGUI, fncDir, prjType):
     """
     monkeypatch.setattr(GuiProjectWizard, "exec_", lambda *a: None)
 
-    nwGUI.mainConf.lastPath = " "
     nwWiz = GuiProjectWizard(nwGUI)
     nwWiz.show()
     qtbot.addWidget(nwWiz)

tests/test_tools/test_tools_writingstats.py

@@ -44,7 +44,6 @@ def testToolWritingStats_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
     sessFile = os.path.join(fncProj, "meta", nwFiles.SESS_STATS)
 
     # Open the Writing Stats dialog
-    nwGUI.mainConf.lastPath = ""
     nwGUI.mainMenu.aWritingStats.activate(QAction.Trigger)
     qtbot.waitUntil(lambda: getGuiItem("GuiWritingStats") is not None, timeout=1000)
 
@@ -135,8 +134,6 @@ def testToolWritingStats_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
     assert sessLog._saveData(sessLog.FMT_JSON)
     qtbot.wait(100)
 
-    assert nwGUI.mainConf.lastPath == fncDir
-
     # Check the exported files
     jsonStats = os.path.join(fncDir, "sessionStats.json")
     with open(jsonStats, mode="r", encoding="utf-8") as inFile: