From bd5916e0420ea5c194aabff984e705b699151436 Mon Sep 17 00:00:00 2001 From: Frisk Date: Mon, 10 May 2021 00:10:36 +0200 Subject: [PATCH] Adding more test cases, fixed some duplicated formatter names --- extensions/base/cargo.py | 10 +++++----- extensions/base/managewiki.py | 2 +- test/test_util.py | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/extensions/base/cargo.py b/extensions/base/cargo.py index 824dc3e..4707e2b 100644 --- a/extensions/base/cargo.py +++ b/extensions/base/cargo.py @@ -48,7 +48,7 @@ def compact_cargo_createtable(ctx: Context, change: dict): return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content) -# cargo/recreatetable +# cargo/recreatetable - Recreating a Cargo table @formatter.embed(event="cargo/recreatetable") @@ -71,7 +71,7 @@ def compact_cargo_recreatetable(ctx: Context, change: dict): return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content) -# cargo/replacetable +# cargo/replacetable - Replacing a Cargo table @formatter.embed(event="cargo/replacetable") @@ -84,7 +84,7 @@ def embed_cargo_replacetable(ctx: Context, change: dict): return embed -@formatter.compact(event="cargo/recreatetable") +@formatter.compact(event="cargo/replacetable") def compact_cargo_replacetable(ctx: Context, change: dict): author, author_url = compact_author(ctx, change) table = re.search(r"\[(.*?)]\(<(.*?)>\)", ctx.client.parse_links(change["logparams"]["0"])) @@ -94,7 +94,7 @@ def compact_cargo_replacetable(ctx: Context, change: dict): return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content) -# cargo/deletetable +# cargo/deletetable - Deleting a table in Cargo @formatter.embed(event="cargo/deletetable") @@ -106,7 +106,7 @@ def embed_cargo_deletetable(ctx: Context, change: dict): return embed -@formatter.compact(event="cargo/recreatetable") +@formatter.compact(event="cargo/deletetable") def compact_cargo_deletetable(ctx: Context, change: dict): author, author_url = compact_author(ctx, change) content = _("[{author}]({author_url}) deleted the Cargo table \"{table}\"").format(author=author, diff --git a/extensions/base/managewiki.py b/extensions/base/managewiki.py index ce29324..e09dbb0 100644 --- a/extensions/base/managewiki.py +++ b/extensions/base/managewiki.py @@ -195,7 +195,7 @@ def embed_managewiki_unlock(ctx: Context, change: dict): return embed -@formatter.compact(event="managewiki/undelete") +@formatter.compact(event="managewiki/unlock") def compact_managewiki_unlock(ctx: Context, change: dict): author, author_url = compact_author(ctx, change) parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*" diff --git a/test/test_util.py b/test/test_util.py index 9122ce2..d83e579 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -14,12 +14,21 @@ # along with RcGcDw. If not, see . from unittest import TestCase, main -from src.api.util import sanitize_to_url +from src.api.util import sanitize_to_url, sanitize_to_markdown, clean_link class Test(TestCase): - def test_sanitize_to_url(self): - self.assertEqual(sanitize_to_url("Breaking rcgcdw . \ / : ? = ) & - ~ this is a test)"), "Breaking_rcgcdw_._%5C_/_:_%3F_%3D_%29_%26_-_~_this_is_a_test%29") + def test_sanitize_to_url(self): + self.assertEqual(sanitize_to_url("Breaking rcgcdw . \ / : ? = ) & - ~ this is a test)"), + "Breaking_rcgcdw_._%5C_/_:_%3F_%3D_%29_%26_-_~_this_is_a_test%29") + + def test_sanitize_to_markdown(self): + self.assertEqual(sanitize_to_markdown( + " This @MarkusRost [] is a **Markdown** te\"'''st __wow__ (I'm a link)[https://google.com/____]^^ ` nice {} comment\\\\foa*&&V^%A(!#)@!@I$Jfkasnfgamc,ajf ah wtf#####;h,a "), + " This \\@MarkusRost [] is a \\*\\*Markdown\\*\\* te\"\'\'\'st \\_\\_wow\\_\\_ (I\'m a link)[https\\:/\\/google.com/\\_\\_\\_\\_]^^ \\` nice \\{\\} comment\\\\\\\\foa\\*&&V^%A(!#)\\@!\\@I$Jfkasnfgamc,ajf ah wtf#####;h,a ") + + def test_clean_link(self): + self.assertEqual(clean_link("https://example.com"), "") if __name__ == '__main__':