Merge branch 'master' of https://github.com/python-discord/bot into help-refactor

 Conflicts:

	bot/cogs/help.py

1 files changed, 0 insertions, 32 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index d3de4484d..000000000
--- a/tests/conftest.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from unittest.mock import MagicMock
-
-import pytest
-
-from bot.constants import Roles
-from tests.helpers import AsyncMock
-
-
[email protected]()
-def moderator_role():
-    mock = MagicMock()
-    mock.id = Roles.moderator
-    mock.name = 'Moderator'
-    mock.mention = f'&{mock.name}'
-    return mock
-
-
[email protected]()
-def simple_bot():
-    mock = MagicMock()
-    mock._before_invoke = AsyncMock()
-    mock._after_invoke = AsyncMock()
-    mock.can_run = AsyncMock()
-    mock.can_run.return_value = True
-    return mock
-
-
[email protected]()
-def simple_ctx(simple_bot):
-    mock = MagicMock()
-    mock.bot = simple_bot
-    return mock