diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-10-14 22:28:51 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-10-14 22:31:45 +0200 |
| commit | e66237395ab1470002f5dd61de9eeb19ca4600eb (patch) | |
| tree | cb7a72198b25318d5ecea19b996ce1834b8a8675 /tests | |
| parent | Use `MockBot`. (diff) | |
Make test_token_remover use our discord Mocks
This commit replaces the standard MagicMocks by our specialized mocks
for discord.py objects. It also adds the missing `channel` attribute
to the `tests.helpers.MockMessage` mock and moves the file to the
correct folder.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bot/cogs/test_token_remover.py (renamed from tests/cogs/test_token_remover.py) | 12 | ||||
| -rw-r--r-- | tests/helpers.py | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/cogs/test_token_remover.py b/tests/bot/cogs/test_token_remover.py index 3738b6d1b..dfb1bafc9 100644 --- a/tests/cogs/test_token_remover.py +++ b/tests/bot/cogs/test_token_remover.py @@ -11,7 +11,7 @@ from bot.cogs.token_remover import ( setup as setup_cog, ) from bot.constants import Channels, Colours, Event, Icons -from tests.helpers import AsyncMock, MockBot +from tests.helpers import AsyncMock, MockBot, MockMessage class TokenRemoverTests(unittest.TestCase): @@ -24,18 +24,14 @@ class TokenRemoverTests(unittest.TestCase): self.bot.get_cog.return_value.send_log_message = AsyncMock() self.cog = TokenRemover(bot=self.bot) - self.msg = MagicMock() - self.msg.author = MagicMock() + self.msg = MockMessage(message_id=555, content='') + self.msg.author.__str__ = MagicMock() self.msg.author.__str__.return_value = 'lemon' self.msg.author.bot = False self.msg.author.avatar_url_as.return_value = 'picture-lemon.png' self.msg.author.id = 42 self.msg.author.mention = '@lemon' - self.msg.channel.send = AsyncMock() - self.msg.channel.mention = '#lemonade-stand' - self.msg.content = '' - self.msg.delete = AsyncMock() - self.msg.id = 555 + self.msg.channel.mention = "#lemonade-stand" def test_is_valid_user_id_is_true_for_numeric_content(self): """A string decoding to numeric characters is a valid user ID.""" diff --git a/tests/helpers.py b/tests/helpers.py index f8e8357f1..892d42e6c 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -415,6 +415,7 @@ class MockMessage(AttributeMock, unittest.mock.MagicMock): def __init__(self, **kwargs) -> None: super().__init__(spec=message_instance, **kwargs) self.author = MockMember() + self.channel = MockTextChannel() # `discord.Message` coroutines self.ack = AsyncMock() |