1 files changed, 24 insertions, 10 deletions
diff --git a/tests/helpers.py b/tests/helpers.py
index 580848c25..1164828d6 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -388,12 +388,17 @@ class MockTextChannel(CustomMockMixin, unittest.mock.Mock, HashableMixin):
     spec_set = text_channel_instance
 
     def __init__(self, **kwargs) -> None:
-        default_kwargs = {"id": next(self.discord_id), "name": "channel", "guild": MockGuild()}
+        default_kwargs = {"id": next(self.discord_id), "name": "channel"}
         super().__init__(**collections.ChainMap(kwargs, default_kwargs))
 
         if "mention" not in kwargs:
             self.mention = f"#{self.name}"
 
+    @cached_property
+    def guild(self) -> MockGuild:
+        """Cached guild property."""
+        return MockGuild()
+
 
 class MockVoiceChannel(CustomMockMixin, unittest.mock.Mock, HashableMixin):
     """
@@ -405,12 +410,17 @@ class MockVoiceChannel(CustomMockMixin, unittest.mock.Mock, HashableMixin):
     spec_set = voice_channel_instance
 
     def __init__(self, **kwargs) -> None:
-        default_kwargs = {"id": next(self.discord_id), "name": "channel", "guild": MockGuild()}
+        default_kwargs = {"id": next(self.discord_id), "name": "channel"}
         super().__init__(**collections.ChainMap(kwargs, default_kwargs))
 
         if "mention" not in kwargs:
             self.mention = f"#{self.name}"
 
+    @cached_property
+    def guild(self) -> MockGuild:
+        """Cached guild property."""
+        return MockGuild()
+
 
 # Create data for the DMChannel instance
 state = unittest.mock.MagicMock()
@@ -500,10 +510,12 @@ class MockContext(CustomMockMixin, unittest.mock.MagicMock):
         super().__init__(**kwargs)
         self.me = kwargs.get("me", MockMember())
         self.bot = kwargs.get("bot", MockBot())
-        self.guild = kwargs.get("guild", MockGuild())
-        self.author = kwargs.get("author", MockMember())
-        self.channel = kwargs.get("channel", MockTextChannel())
-        self.message = kwargs.get("message", MockMessage())
+
+        self.message = kwargs.get("message", MockMessage(guild=self.guild))
+        self.author = kwargs.get("author", self.message.author)
+        self.channel = kwargs.get("channel", self.message.channel)
+        self.guild = kwargs.get("guild", self.channel.guild)
+
         self.invoked_from_error_handler = kwargs.get("invoked_from_error_handler", False)
 
 
@@ -519,10 +531,12 @@ class MockInteraction(CustomMockMixin, unittest.mock.MagicMock):
         super().__init__(**kwargs)
         self.me = kwargs.get("me", MockMember())
         self.client = kwargs.get("client", MockBot())
-        self.guild = kwargs.get("guild", MockGuild())
-        self.user = kwargs.get("user", MockMember())
-        self.channel = kwargs.get("channel", MockTextChannel())
-        self.message = kwargs.get("message", MockMessage())
+
+        self.message = kwargs.get("message", MockMessage(guild=self.guild))
+        self.user = kwargs.get("user", self.message.author)
+        self.channel = kwargs.get("channel", self.message.channel)
+        self.guild = kwargs.get("guild", self.channel.guild)
+
         self.invoked_from_error_handler = kwargs.get("invoked_from_error_handler", False)