Fix tests for variable change, and change monkeypatches to use the context manager

tests/test_gui/test_gui_mainmenu.py

@@ -534,9 +534,9 @@ def testGuiMenu_Insert(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
 
     # Faulty Keyword Inserts
     assert not nwGUI.docEditor.insertKeyWord("blabla")
-    monkeypatch.setattr(QTextBlock, "isValid", lambda *args, **kwards: False)
-    assert not nwGUI.docEditor.insertKeyWord(nwKeyWords.TAG_KEY)
-    monkeypatch.undo()
+    with monkeypatch.context() as mp:
+        mp.setattr(QTextBlock, "isValid", lambda *args, **kwards: False)
+        assert not nwGUI.docEditor.insertKeyWord(nwKeyWords.TAG_KEY)
 
     nwGUI.docEditor.clear()
 

tests/test_gui/test_gui_projdetails.py

@@ -110,6 +110,5 @@ def testGuiProjDetails_Dialog(qtbot, monkeypatch, nwGUI, nwLipsum):
     # Clean Up
     projDet._doClose()
     nwGUI.closeMain()
-    monkeypatch.undo()
 
 # END Test testGuiProjDetails_Dialog

tests/test_gui/test_gui_projwizard.py

@@ -62,18 +62,17 @@ def testGuiProjectWizard_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
 
     # Close project, but call with invalid path
     assert nwGUI.closeProject()
-    monkeypatch.setattr(nwGUI, "showNewProjectDialog", lambda *args: None)
-    assert not nwGUI.newProject()
+    with monkeypatch.context() as mp:
+        mp.setattr(nwGUI, "showNewProjectDialog", lambda *args: None)
+        assert not nwGUI.newProject()
 
-    # Now, with an empty dictionary
-    monkeypatch.setattr(nwGUI, "showNewProjectDialog", lambda *args: {})
-    assert not nwGUI.newProject()
+        # Now, with an empty dictionary
+        mp.setattr(nwGUI, "showNewProjectDialog", lambda *args: {})
+        assert not nwGUI.newProject()
 
-    # Now, with a non-empty folder
-    monkeypatch.setattr(nwGUI, "showNewProjectDialog", lambda *args: {"projPath": nwMinimal})
-    assert not nwGUI.newProject()
-
-    monkeypatch.undo()
+        # Now, with a non-empty folder
+        mp.setattr(nwGUI, "showNewProjectDialog", lambda *args: {"projPath": nwMinimal})
+        assert not nwGUI.newProject()
 
     ##
     #  Test the Wizard

tests/test_gui/test_gui_writingstats.py

@@ -428,6 +428,4 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
     assert nwGUI.closeProject()
     qtbot.wait(stepDelay)
 
-    monkeypatch.undo()
-
 # END Test testGuiWritingStats_Dialog