From dee79edcbb3adf56d0bd08f5deef50860f6552e4 Mon Sep 17 00:00:00 2001 From: InspectorCaracal Date: Sun, 20 Nov 2022 19:30:21 -0700 Subject: [PATCH 1/3] update and fix chargen contrib test --- .../contrib/rpg/character_creator/tests.py | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/evennia/contrib/rpg/character_creator/tests.py b/evennia/contrib/rpg/character_creator/tests.py index e25923db62..20ec376660 100644 --- a/evennia/contrib/rpg/character_creator/tests.py +++ b/evennia/contrib/rpg/character_creator/tests.py @@ -9,24 +9,28 @@ from . import character_creator class TestAccount(BaseEvenniaCommandTest): + def setUp(self): + super().setUp() + self.account.swap_typeclass(character_creator.ContribChargenAccount) + def test_ooc_look(self): - if settings.MULTISESSION_MODE < 2: - self.call( - account.CmdOOCLook(), "", "You are out-of-character (OOC).", caller=self.account - ) - if settings.MULTISESSION_MODE == 2: - # test both normal output and also inclusion of in-progress character - self.account.db._playable_characters = [self.char1] - self.char1.db.chargen_step = "start" + self.account.db._playable_characters = [self.char1] + self.account.unpuppet_all() + + self.char1.db.chargen_step = "start" + + with patch("evennia.commands.default.account._AUTO_PUPPET_ON_LOGIN", new=False): + # check that correct output is returning output = self.call( account.CmdOOCLook(), "", "Account TestAccount (you are Out-of-Character)", caller=self.account, ) - self.assertIn("|Yin progress|n", output) + # check that char1 is recognized as in progress + self.assertIn("in progress", output) - @override_settings(CHARGEN_MENU="evennia.contrib.base_systems.character_creator.example_menu") + @override_settings(CHARGEN_MENU="evennia.contrib.rpg.character_creator.example_menu") def test_char_create(self): self.call( character_creator.ContribCmdCharCreate(), From e398e904e333822d67c479761e86bc6ea6530d4a Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:43:26 -0700 Subject: [PATCH 2/3] add import --- evennia/contrib/rpg/character_creator/tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/evennia/contrib/rpg/character_creator/tests.py b/evennia/contrib/rpg/character_creator/tests.py index 20ec376660..7b269067d7 100644 --- a/evennia/contrib/rpg/character_creator/tests.py +++ b/evennia/contrib/rpg/character_creator/tests.py @@ -1,3 +1,4 @@ +from unittest.mock import patch from django.conf import settings from django.test import override_settings from evennia import DefaultCharacter From 6abdb78e46d365c8f0eb3fbb43154ce22494fa9e Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Sun, 20 Nov 2022 21:00:29 -0700 Subject: [PATCH 3/3] rename test class for clarity --- evennia/contrib/rpg/character_creator/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/rpg/character_creator/tests.py b/evennia/contrib/rpg/character_creator/tests.py index 7b269067d7..b9691dc8c5 100644 --- a/evennia/contrib/rpg/character_creator/tests.py +++ b/evennia/contrib/rpg/character_creator/tests.py @@ -9,7 +9,7 @@ from evennia.utils.test_resources import BaseEvenniaCommandTest from . import character_creator -class TestAccount(BaseEvenniaCommandTest): +class TestCharacterCreator(BaseEvenniaCommandTest): def setUp(self): super().setUp() self.account.swap_typeclass(character_creator.ContribChargenAccount)