Fix tests and a few other bits

tests/test_gui/test_gui_guimain.py

@@ -29,7 +29,7 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QMessageBox, QInputDialog
 
 from novelwriter.gui import GuiDocEditor, GuiNovelView, GuiOutlineView
-from novelwriter.enum import nwItemType, nwWidget
+from novelwriter.enum import nwItemType, nwView, nwWidget
 from novelwriter.tools import GuiProjectWizard
 from novelwriter.gui.projtree import GuiProjectTree
 from novelwriter.dialogs import GuiEditLabel
@@ -120,6 +120,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     assert nwGUI.openSelectedItem() is False
 
     # Project Tree has focus
+    nwGUI._changeView(nwView.PROJECT)
     nwGUI.switchFocus(nwWidget.TREE)
     nwGUI.projStack.setCurrentIndex(0)
     with monkeypatch.context() as mp:
@@ -131,20 +132,19 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
         assert nwGUI.closeDocument() is True
 
     # Novel Tree has focus
-    nwGUI.projStack.setCurrentIndex(1)
+    nwGUI._changeView(nwView.NOVEL)
     nwGUI.novelView.refreshTree(rootHandle=None, overRide=True)
     with monkeypatch.context() as mp:
         mp.setattr(GuiNovelView, "treeFocus", lambda *a: True)
         assert nwGUI.docEditor.docHandle() is None
-        actItem = nwGUI.novelView.novelTree.topLevelItem(0)
-        chpItem = actItem.child(0)
-        selItem = chpItem.child(0)
+        selItem = nwGUI.novelView.novelTree.topLevelItem(2)
         nwGUI.novelView.novelTree.setCurrentItem(selItem)
         nwGUI._keyPressReturn()
         assert nwGUI.docEditor.docHandle() == sHandle
         assert nwGUI.closeDocument() is True
 
     # Project Outline has focus
+    nwGUI._changeView(nwView.OUTLINE)
     nwGUI.switchFocus(nwWidget.OUTLINE)
     with monkeypatch.context() as mp:
         mp.setattr(GuiOutlineView, "treeFocus", lambda *a: True)
@@ -157,7 +157,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
         assert nwGUI.docEditor.docHandle() == sHandle
         assert nwGUI.closeDocument() is True
 
-    # qtbot.stopForInteraction()
+    # qtbot.stop()
 
 # END Test testGuiMain_ProjectTreeItems