Merge branch 'master' into compact_free

1 files changed, 0 insertions, 264 deletions

diff --git a/tests/test_converters.py b/tests/test_converters.py
deleted file mode 100644
index f69995ec6..000000000
--- a/tests/test_converters.py
+++ /dev/null
@@ -1,264 +0,0 @@
-import asyncio
-import datetime
-from unittest.mock import MagicMock, patch
-
-import pytest
-from dateutil.relativedelta import relativedelta
-from discord.ext.commands import BadArgument
-
-from bot.converters import (
-    Duration,
-    ISODateTime,
-    TagContentConverter,
-    TagNameConverter,
-    ValidPythonIdentifier,
-)
-
-
[email protected](
-    ('value', 'expected'),
-    (
-        ('hello', 'hello'),
-        ('  h ello  ', 'h ello')
-    )
-)
-def test_tag_content_converter_for_valid(value: str, expected: str):
-    assert asyncio.run(TagContentConverter.convert(None, value)) == expected
-
-
[email protected](
-    ('value', 'expected'),
-    (
-        ('', "Tag contents should not be empty, or filled with whitespace."),
-        ('   ', "Tag contents should not be empty, or filled with whitespace.")
-    )
-)
-def test_tag_content_converter_for_invalid(value: str, expected: str):
-    context = MagicMock()
-    context.author = 'bob'
-
-    with pytest.raises(BadArgument, match=expected):
-        asyncio.run(TagContentConverter.convert(context, value))
-
-
[email protected](
-    ('value', 'expected'),
-    (
-        ('tracebacks', 'tracebacks'),
-        ('Tracebacks', 'tracebacks'),
-        ('  Tracebacks  ', 'tracebacks'),
-    )
-)
-def test_tag_name_converter_for_valid(value: str, expected: str):
-    assert asyncio.run(TagNameConverter.convert(None, value)) == expected
-
-
[email protected](
-    ('value', 'expected'),
-    (
-        ('👋', "Don't be ridiculous, you can't use that character!"),
-        ('', "Tag names should not be empty, or filled with whitespace."),
-        ('  ', "Tag names should not be empty, or filled with whitespace."),
-        ('42', "Tag names can't be numbers."),
-        # Escape question mark as this is evaluated as regular expression.
-        ('x' * 128, r"Are you insane\? That's way too long!"),
-    )
-)
-def test_tag_name_converter_for_invalid(value: str, expected: str):
-    context = MagicMock()
-    context.author = 'bob'
-
-    with pytest.raises(BadArgument, match=expected):
-        asyncio.run(TagNameConverter.convert(context, value))
-
-
[email protected]('value', ('foo', 'lemon'))
-def test_valid_python_identifier_for_valid(value: str):
-    assert asyncio.run(ValidPythonIdentifier.convert(None, value)) == value
-
-
[email protected]('value', ('nested.stuff', '#####'))
-def test_valid_python_identifier_for_invalid(value: str):
-    with pytest.raises(BadArgument, match=f'`{value}` is not a valid Python identifier'):
-        asyncio.run(ValidPythonIdentifier.convert(None, value))
-
-
-FIXED_UTC_NOW = datetime.datetime.fromisoformat('2019-01-01T00:00:00')
-
-
[email protected](
-    params=(
-        # Simple duration strings
-        ('1Y', {"years": 1}),
-        ('1y', {"years": 1}),
-        ('1year', {"years": 1}),
-        ('1years', {"years": 1}),
-        ('1m', {"months": 1}),
-        ('1month', {"months": 1}),
-        ('1months', {"months": 1}),
-        ('1w', {"weeks": 1}),
-        ('1W', {"weeks": 1}),
-        ('1week', {"weeks": 1}),
-        ('1weeks', {"weeks": 1}),
-        ('1d', {"days": 1}),
-        ('1D', {"days": 1}),
-        ('1day', {"days": 1}),
-        ('1days', {"days": 1}),
-        ('1h', {"hours": 1}),
-        ('1H', {"hours": 1}),
-        ('1hour', {"hours": 1}),
-        ('1hours', {"hours": 1}),
-        ('1M', {"minutes": 1}),
-        ('1minute', {"minutes": 1}),
-        ('1minutes', {"minutes": 1}),
-        ('1s', {"seconds": 1}),
-        ('1S', {"seconds": 1}),
-        ('1second', {"seconds": 1}),
-        ('1seconds', {"seconds": 1}),
-
-        # Complex duration strings
-        (
-            '1y1m1w1d1H1M1S',
-            {
-                "years": 1,
-                "months": 1,
-                "weeks": 1,
-                "days": 1,
-                "hours": 1,
-                "minutes": 1,
-                "seconds": 1
-            }
-        ),
-        ('5y100S', {"years": 5, "seconds": 100}),
-        ('2w28H', {"weeks": 2, "hours": 28}),
-
-        # Duration strings with spaces
-        ('1 year 2 months', {"years": 1, "months": 2}),
-        ('1d 2H', {"days": 1, "hours": 2}),
-        ('1 week2 days', {"weeks": 1, "days": 2}),
-    )
-)
-def create_future_datetime(request):
-    """Yields duration string and target datetime.datetime object."""
-    duration, duration_dict = request.param
-    future_datetime = FIXED_UTC_NOW + relativedelta(**duration_dict)
-    yield duration, future_datetime
-
-
-def test_duration_converter_for_valid(create_future_datetime: tuple):
-    converter = Duration()
-    duration, expected = create_future_datetime
-    with patch('bot.converters.datetime') as mock_datetime:
-        mock_datetime.utcnow.return_value = FIXED_UTC_NOW
-        assert asyncio.run(converter.convert(None, duration)) == expected
-
-
[email protected](
-    ('duration'),
-    (
-        # Units in wrong order
-        ('1d1w'),
-        ('1s1y'),
-
-        # Duplicated units
-        ('1 year 2 years'),
-        ('1 M 10 minutes'),
-
-        # Unknown substrings
-        ('1MVes'),
-        ('1y3breads'),
-
-        # Missing amount
-        ('ym'),
-
-        # Incorrect whitespace
-        (" 1y"),
-        ("1S "),
-        ("1y  1m"),
-
-        # Garbage
-        ('Guido van Rossum'),
-        ('lemon lemon lemon lemon lemon lemon lemon'),
-    )
-)
-def test_duration_converter_for_invalid(duration: str):
-    converter = Duration()
-    with pytest.raises(BadArgument, match=f'`{duration}` is not a valid duration string.'):
-        asyncio.run(converter.convert(None, duration))
-
-
[email protected](
-    ("datetime_string", "expected_dt"),
-    (
-
-        # `YYYY-mm-ddTHH:MM:SSZ` | `YYYY-mm-dd HH:MM:SSZ`
-        ('2019-09-02T02:03:05Z', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 02:03:05Z', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-
-        # `YYYY-mm-ddTHH:MM:SS±HH:MM` | `YYYY-mm-dd HH:MM:SS±HH:MM`
-        ('2019-09-02T03:18:05+01:15', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 03:18:05+01:15', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02T00:48:05-01:15', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 00:48:05-01:15', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-
-        # `YYYY-mm-ddTHH:MM:SS±HHMM` | `YYYY-mm-dd HH:MM:SS±HHMM`
-        ('2019-09-02T03:18:05+0115', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 03:18:05+0115', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02T00:48:05-0115', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 00:48:05-0115', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-
-        # `YYYY-mm-ddTHH:MM:SS±HH` | `YYYY-mm-dd HH:MM:SS±HH`
-        ('2019-09-02 03:03:05+01', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02T01:03:05-01', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-
-        # `YYYY-mm-ddTHH:MM:SS` | `YYYY-mm-dd HH:MM:SS`
-        ('2019-09-02T02:03:05', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-        ('2019-09-02 02:03:05', datetime.datetime(2019, 9, 2, 2, 3, 5)),
-
-        # `YYYY-mm-ddTHH:MM` | `YYYY-mm-dd HH:MM`
-        ('2019-11-12T09:15', datetime.datetime(2019, 11, 12, 9, 15)),
-        ('2019-11-12 09:15', datetime.datetime(2019, 11, 12, 9, 15)),
-
-        # `YYYY-mm-dd`
-        ('2019-04-01', datetime.datetime(2019, 4, 1)),
-
-        # `YYYY-mm`
-        ('2019-02-01', datetime.datetime(2019, 2, 1)),
-
-        # `YYYY`
-        ('2025', datetime.datetime(2025, 1, 1)),
-    ),
-)
-def test_isodatetime_converter_for_valid(datetime_string: str, expected_dt: datetime.datetime):
-    converter = ISODateTime()
-    converted_dt = asyncio.run(converter.convert(None, datetime_string))
-    assert converted_dt.tzinfo is None
-    assert converted_dt == expected_dt
-
-
[email protected](
-    ("datetime_string"),
-    (
-        # Make sure it doesn't interfere with the Duration converter
-        ('1Y'),
-        ('1d'),
-        ('1H'),
-
-        # Check if it fails when only providing the optional time part
-        ('10:10:10'),
-        ('10:00'),
-
-        # Invalid date format
-        ('19-01-01'),
-
-        # Other non-valid strings
-        ('fisk the tag master'),
-    ),
-)
-def test_isodatetime_converter_for_invalid(datetime_string: str):
-    converter = ISODateTime()
-    with pytest.raises(
-        BadArgument,
-        match=f"`{datetime_string}` is not a valid ISO-8601 datetime string",
-    ):
-        asyncio.run(converter.convert(None, datetime_string))