From 334bfaefadd8c96dcf42965791c8d1fddfafbebb Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:49:19 -0600 Subject: [PATCH 1/4] fix crafting msg traceback --- evennia/contrib/game_systems/crafting/crafting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/game_systems/crafting/crafting.py b/evennia/contrib/game_systems/crafting/crafting.py index 593f1a04b9..875e843d5f 100644 --- a/evennia/contrib/game_systems/crafting/crafting.py +++ b/evennia/contrib/game_systems/crafting/crafting.py @@ -237,7 +237,7 @@ class CraftingRecipeBase: **kwargs: Any optional properties relevant to this send. """ - self.crafter.msg(message, {"type": "crafting"}) + self.crafter.msg(text=(message, {"type": "crafting"})) def pre_craft(self, **kwargs): """ From 540729e2b43683a00b3e0e881b1f57f0d3e023a6 Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Sat, 30 Mar 2024 13:38:13 -0600 Subject: [PATCH 2/4] update crafting contrib tests --- .../contrib/game_systems/crafting/tests.py | 76 +++++++++++-------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/evennia/contrib/game_systems/crafting/tests.py b/evennia/contrib/game_systems/crafting/tests.py index 41ae4412bf..9e42695d1d 100644 --- a/evennia/contrib/game_systems/crafting/tests.py +++ b/evennia/contrib/game_systems/crafting/tests.py @@ -78,7 +78,7 @@ class TestCraftingRecipeBase(BaseEvenniaTestCase): """Test messaging to crafter""" self.recipe.msg("message") - self.crafter.msg.assert_called_with("message", {"type": "crafting"}) + self.crafter.msg.assert_called_with(text="message", {"type": "crafting"})) def test_pre_craft(self): """Test validating hook""" @@ -206,7 +206,7 @@ class TestCraftingRecipe(BaseEvenniaTestCase): self.assertEqual(result[0].key, "Result1") self.assertEqual(result[0].tags.all(), ["result1", "resultprot"]) self.crafter.msg.assert_called_with( - recipe.success_message.format(outputs="Result1"), {"type": "crafting"} + text=(recipe.success_message.format(outputs="Result1"), {"type": "crafting"}) ) # make sure consumables are gone @@ -251,8 +251,10 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_tool_missing_message.format(outputs="Result1", missing="tool2"), - {"type": "crafting"}, + text=( + recipe.error_tool_missing_message.format(outputs="Result1", missing="tool2"), + {"type": "crafting"}, + ) ) # make sure consumables are still there @@ -269,8 +271,10 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_consumable_missing_message.format(outputs="Result1", missing="cons3"), - {"type": "crafting"}, + text=( + recipe.error_consumable_missing_message.format(outputs="Result1", missing="cons3"), + {"type": "crafting"}, + ) ) # make sure consumables are still there @@ -293,8 +297,10 @@ class TestCraftingRecipe(BaseEvenniaTestCase): self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_consumable_missing_message.format(outputs="Result1", missing="cons3"), - {"type": "crafting"}, + text=( + recipe.error_consumable_missing_message.format(outputs="Result1", missing="cons3"), + {"type": "crafting"}, + ) ) # make sure consumables are deleted even though we failed @@ -317,10 +323,12 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_tool_excess_message.format( - outputs="Result1", excess=wrong.get_display_name(looker=self.crafter) - ), - {"type": "crafting"}, + text=( + recipe.error_tool_excess_message.format( + outputs="Result1", excess=wrong.get_display_name(looker=self.crafter) + ), + {"type": "crafting"}, + ) ) # make sure consumables are still there self.assertIsNotNone(self.cons1.pk) @@ -342,10 +350,12 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_tool_excess_message.format( - outputs="Result1", excess=tool3.get_display_name(looker=self.crafter) - ), - {"type": "crafting"}, + text=( + recipe.error_tool_excess_message.format( + outputs="Result1", excess=tool3.get_display_name(looker=self.crafter) + ), + {"type": "crafting"}, + ) ) # make sure consumables are still there @@ -369,10 +379,12 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_consumable_excess_message.format( - outputs="Result1", excess=cons4.get_display_name(looker=self.crafter) - ), - {"type": "crafting"}, + text=( + recipe.error_consumable_excess_message.format( + outputs="Result1", excess=cons4.get_display_name(looker=self.crafter) + ), + {"type": "crafting"}, + ) ) # make sure consumables are still there @@ -396,7 +408,7 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertTrue(result) self.crafter.msg.assert_called_with( - recipe.success_message.format(outputs="Result1"), {"type": "crafting"} + text=(recipe.success_message.format(outputs="Result1"), {"type": "crafting"}) ) # make sure consumables are gone @@ -419,7 +431,7 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertTrue(result) self.crafter.msg.assert_called_with( - recipe.success_message.format(outputs="Result1"), {"type": "crafting"} + text=(recipe.success_message.format(outputs="Result1"), {"type": "crafting"}) ) # make sure consumables are gone @@ -439,10 +451,12 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_tool_order_message.format( - outputs="Result1", missing=self.tool2.get_display_name(looker=self.crafter) - ), - {"type": "crafting"}, + text=( + recipe.error_tool_order_message.format( + outputs="Result1", missing=self.tool2.get_display_name(looker=self.crafter) + ), + {"type": "crafting"}, + ) ) # make sure consumables are still there @@ -462,10 +476,12 @@ class TestCraftingRecipe(BaseEvenniaTestCase): result = recipe.craft() self.assertFalse(result) self.crafter.msg.assert_called_with( - recipe.error_consumable_order_message.format( - outputs="Result1", missing=self.cons3.get_display_name(looker=self.crafter) - ), - {"type": "crafting"}, + text=( + recipe.error_consumable_order_message.format( + outputs="Result1", missing=self.cons3.get_display_name(looker=self.crafter) + ), + {"type": "crafting"}, + ) ) # make sure consumables are still there From a0754d9f1a1ba0131c809e3872e3c2e1ad87c117 Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Sat, 30 Mar 2024 14:14:30 -0600 Subject: [PATCH 3/4] add missing paren --- evennia/contrib/game_systems/crafting/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/game_systems/crafting/tests.py b/evennia/contrib/game_systems/crafting/tests.py index 9e42695d1d..7dff337035 100644 --- a/evennia/contrib/game_systems/crafting/tests.py +++ b/evennia/contrib/game_systems/crafting/tests.py @@ -78,7 +78,7 @@ class TestCraftingRecipeBase(BaseEvenniaTestCase): """Test messaging to crafter""" self.recipe.msg("message") - self.crafter.msg.assert_called_with(text="message", {"type": "crafting"})) + self.crafter.msg.assert_called_with(text=("message", {"type": "crafting"})) def test_pre_craft(self): """Test validating hook""" From 8f14cef6e60efdbf51426531a27cdb20b0eb96f9 Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Sat, 30 Mar 2024 14:36:01 -0600 Subject: [PATCH 4/4] missed another msg test --- evennia/contrib/game_systems/crafting/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/game_systems/crafting/tests.py b/evennia/contrib/game_systems/crafting/tests.py index 7dff337035..201fa487b6 100644 --- a/evennia/contrib/game_systems/crafting/tests.py +++ b/evennia/contrib/game_systems/crafting/tests.py @@ -235,7 +235,7 @@ class TestCraftingRecipe(BaseEvenniaTestCase): self.assertEqual(result[0].key, "Result1") self.assertEqual(result[0].tags.all(), ["result1", "resultprot"]) self.crafter.msg.assert_called_with( - recipe.success_message.format(outputs="Result1"), {"type": "crafting"} + text=(recipe.success_message.format(outputs="Result1"), {"type": "crafting"}) ) # make sure consumables are gone