aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/bot/exts/info/test_information.py1
-rw-r--r--tests/bot/exts/moderation/test_silence.py19
-rw-r--r--tests/bot/test_api.py8
-rw-r--r--tests/helpers.py2
4 files changed, 7 insertions, 23 deletions
diff --git a/tests/bot/exts/info/test_information.py b/tests/bot/exts/info/test_information.py
index daede54c5..043cce8de 100644
--- a/tests/bot/exts/info/test_information.py
+++ b/tests/bot/exts/info/test_information.py
@@ -355,6 +355,7 @@ class UserEmbedTests(unittest.IsolatedAsyncioTestCase):
self.assertEqual(
textwrap.dedent(f"""
Joined: {"1 year ago"}
+ Pending: {"False"}
Roles: &Moderators
""").strip(),
embed.fields[1].value
diff --git a/tests/bot/exts/moderation/test_silence.py b/tests/bot/exts/moderation/test_silence.py
index 90ddf6ad7..31894761c 100644
--- a/tests/bot/exts/moderation/test_silence.py
+++ b/tests/bot/exts/moderation/test_silence.py
@@ -117,15 +117,6 @@ class SilenceCogTests(unittest.IsolatedAsyncioTestCase):
self.bot.get_guild.assert_called_once_with(Guild.id)
@autospec(silence, "SilenceNotifier", pass_mocks=False)
- async def test_async_init_got_role(self):
- """Got `Roles.verified` role from guild."""
- guild = self.bot.get_guild()
- guild.get_role.side_effect = lambda id_: Mock(id=id_)
-
- await self.cog._async_init()
- self.assertEqual(self.cog._verified_msg_role.id, Roles.verified)
-
- @autospec(silence, "SilenceNotifier", pass_mocks=False)
async def test_async_init_got_channels(self):
"""Got channels from bot."""
self.bot.get_channel.side_effect = lambda id_: MockTextChannel(id=id_)
@@ -508,7 +499,7 @@ class SilenceTests(unittest.IsolatedAsyncioTestCase):
self.assertFalse(self.text_overwrite.send_messages)
self.assertFalse(self.text_overwrite.add_reactions)
self.text_channel.set_permissions.assert_awaited_once_with(
- self.cog._verified_msg_role,
+ self.cog._everyone_role,
overwrite=self.text_overwrite
)
@@ -688,7 +679,7 @@ class UnsilenceTests(unittest.IsolatedAsyncioTestCase):
"""Channel's `send_message` and `add_reactions` overwrites were restored."""
await self.cog._unsilence(self.channel)
self.channel.set_permissions.assert_awaited_once_with(
- self.cog._verified_msg_role,
+ self.cog._everyone_role,
overwrite=self.overwrite,
)
@@ -702,7 +693,7 @@ class UnsilenceTests(unittest.IsolatedAsyncioTestCase):
await self.cog._unsilence(self.channel)
self.channel.set_permissions.assert_awaited_once_with(
- self.cog._verified_msg_role,
+ self.cog._everyone_role,
overwrite=self.overwrite,
)
@@ -765,7 +756,7 @@ class UnsilenceTests(unittest.IsolatedAsyncioTestCase):
ctx = MockContext()
text_channel = MockTextChannel()
- text_role = self.cog.bot.get_guild(Guild.id).get_role(Roles.verified)
+ text_role = self.cog.bot.get_guild(Guild.id).default_role
voice_channel = MockVoiceChannel()
voice_role = self.cog.bot.get_guild(Guild.id).get_role(Roles.voice_verified)
@@ -802,7 +793,7 @@ class UnsilenceTests(unittest.IsolatedAsyncioTestCase):
ctx = MockContext()
text_channel = MockTextChannel()
- text_role = self.cog.bot.get_guild(Guild.id).get_role(Roles.verified)
+ text_role = self.cog.bot.get_guild(Guild.id).default_role
voice_channel = MockVoiceChannel()
voice_role = self.cog.bot.get_guild(Guild.id).get_role(Roles.voice_verified)
diff --git a/tests/bot/test_api.py b/tests/bot/test_api.py
index 99e942813..76bcb481d 100644
--- a/tests/bot/test_api.py
+++ b/tests/bot/test_api.py
@@ -13,14 +13,6 @@ class APIClientTests(unittest.IsolatedAsyncioTestCase):
cls.error_api_response = MagicMock()
cls.error_api_response.status = 999
- def test_loop_is_not_running_by_default(self):
- """The event loop should not be running by default."""
- self.assertFalse(api.loop_is_running())
-
- async def test_loop_is_running_in_async_context(self):
- """The event loop should be running in an async context."""
- self.assertTrue(api.loop_is_running())
-
def test_response_code_error_default_initialization(self):
"""Test the default initialization of `ResponseCodeError` without `text` or `json`"""
error = api.ResponseCodeError(response=self.error_api_response)
diff --git a/tests/helpers.py b/tests/helpers.py
index 5628ca31f..529664e67 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -229,7 +229,7 @@ class MockMember(CustomMockMixin, unittest.mock.Mock, ColourMixin, HashableMixin
spec_set = member_instance
def __init__(self, roles: Optional[Iterable[MockRole]] = None, **kwargs) -> None:
- default_kwargs = {'name': 'member', 'id': next(self.discord_id), 'bot': False}
+ default_kwargs = {'name': 'member', 'id': next(self.discord_id), 'bot': False, "pending": False}
super().__init__(**collections.ChainMap(kwargs, default_kwargs))
self.roles = [MockRole(name="@everyone", position=1, id=0)]