diff --git a/tests/test_core/test_core_tokenizer.py b/tests/test_core/test_core_tokenizer.py index d07ab411..a74e567c 100644 --- a/tests/test_core/test_core_tokenizer.py +++ b/tests/test_core/test_core_tokenizer.py @@ -1123,7 +1123,7 @@ def testCoreToken_ProcessHeaders(mockGUI): # H3: Scene wo/Format, first tokens._text = "### Scene One\n" tokens.setSceneFormat("", False) - tokens._allowSeparator = True + tokens._skipSeparator = True tokens.tokenizeText() tokens.doHeaders() assert tokens._tokens == [ @@ -1134,7 +1134,7 @@ def testCoreToken_ProcessHeaders(mockGUI): # H3: Scene wo/Format, not first tokens._text = "### Scene One\n" tokens.setSceneFormat("", False) - tokens._allowSeparator = False + tokens._skipSeparator = False tokens.tokenizeText() tokens.doHeaders() assert tokens._tokens == [ @@ -1145,7 +1145,7 @@ def testCoreToken_ProcessHeaders(mockGUI): # H3: Scene Separator, first tokens._text = "### Scene One\n" tokens.setSceneFormat("* * *", False) - tokens._allowSeparator = True + tokens._skipSeparator = True tokens.tokenizeText() tokens.doHeaders() assert tokens._tokens == [ @@ -1156,7 +1156,7 @@ def testCoreToken_ProcessHeaders(mockGUI): # H3: Scene Separator, not first tokens._text = "### Scene One\n" tokens.setSceneFormat("* * *", False) - tokens._allowSeparator = False + tokens._skipSeparator = False tokens.tokenizeText() tokens.doHeaders() assert tokens._tokens == [ @@ -1231,13 +1231,19 @@ def testCoreToken_ProcessHeaders(mockGUI): (Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE), ] - # Check the first scene detector - assert tokens._allowSeparator is False - tokens._allowSeparator = True + # Check the first scene detector, plain text + tokens._skipSeparator = True tokens._text = "Some text ...\n" tokens.tokenizeText() tokens.doHeaders() - assert tokens._allowSeparator is False + assert tokens._skipSeparator is True + + # Check the first scene detector, text plus scene + tokens._skipSeparator = True + tokens._text = "Some text ...\n\n### Scene\n\nText" + tokens.tokenizeText() + tokens.doHeaders() + assert tokens._skipSeparator is False # END Test testCoreToken_ProcessHeaders diff --git a/tests/test_tools/test_tools_manuscript.py b/tests/test_tools/test_tools_manuscript.py index e1615737..734642d4 100644 --- a/tests/test_tools/test_tools_manuscript.py +++ b/tests/test_tools/test_tools_manuscript.py @@ -47,7 +47,7 @@ def testManuscript_Init(monkeypatch, qtbot: QtBot, nwGUI: GuiMain, projPath: Pat buildTestProject(nwGUI, projPath) nwGUI.openProject(projPath) SHARED.project.storage.getDocument(C.hChapterDoc).writeDocument("## A Chapter\n\n\t\tHi") - allText = "New Novel\nBy Jane Doe\nA Chapter\n\t\tHi\n* * *" + allText = "New Novel\nBy Jane Doe\nA Chapter\n\t\tHi" nwGUI.mainMenu.aBuildManuscript.activate(QAction.Trigger) qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiManuscript) is not None, timeout=1000)