From 590a10af332650a8a1eb61db7db7457dc63f229a Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Thu, 24 Dec 2020 16:40:08 -0600
Subject: Adds tests for breaking tag and mention links after text is converted
 from markdown to html

---
 test/pleroma/formatter_test.exs | 78 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs
index 5781a3f01..f47331bc3 100644
--- a/test/pleroma/formatter_test.exs
+++ b/test/pleroma/formatter_test.exs
@@ -284,6 +284,34 @@ defmodule Pleroma.FormatterTest do
 
       assert {^expected_text, ^expected_mentions, []} = Formatter.linkify(text)
     end
+
+    test "correctly parses mentions in html" do
+      text = "<p>@lain hello</p>"
+      lain = insert(:user, %{nickname: "lain"})
+
+      {text, mentions, []} = Formatter.linkify(text)
+
+      assert length(mentions) == 1
+
+      expected_text =
+        ~s(<p><span class="h-card"><a class="u-url mention" data-user="#{lain.id}" href="#{lain.ap_id}" rel="ugc">@<span>lain</span></a></span> hello</p>)
+
+      assert expected_text == text
+    end
+
+    test "correctly parses mentions on the last line of html" do
+      text = "<p>Hello</p><p>@lain</p>"
+      lain = insert(:user, %{nickname: "lain"})
+
+      {text, mentions, []} = Formatter.linkify(text)
+
+      assert length(mentions) == 1
+
+      expected_text =
+        ~s(<p>Hello</p><p><span class="h-card"><a class="u-url mention" data-user="#{lain.id}" href="#{lain.ap_id}" rel="ugc">@<span>lain</span></a></p></span>)
+
+      assert expected_text == text
+    end
   end
 
   describe ".parse_tags" do
@@ -299,6 +327,56 @@ defmodule Pleroma.FormatterTest do
 
       assert {_text, [], ^expected_tags} = Formatter.linkify(text)
     end
+
+    test "parses tags in html" do
+      text = "<p>This is a #test</p>"
+
+      expected_tags = [
+        {"#test", "test"},
+      ]
+
+      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
+    end
+
+    test "parses mulitple tags in html" do
+      text = "<p>#tag1 #tag2 #tag3 #tag4</p>"
+
+      expected_tags = [
+        {"#tag1", "tag1"},
+        {"#tag2", "tag2"},
+        {"#tag3", "tag3"},
+        {"#tag4", "tag4"},
+      ]
+
+      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
+    end
+
+    test "parses tags on the last line of html" do
+      text = "<p>This is a</p><p>#test</p>"
+
+      expected_tags = [
+        {"#test", "test"},
+      ]
+
+      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
+    end
+
+    test "parses mulitple tags on mulitple lines in html" do
+      text = "<p>testing...</p><p>#tag1 #tag2 #tag3 #tag4</p><p>paragraph</p><p>#tag5 #tag6 #tag7 #tag8</p>"
+
+      expected_tags = [
+        {"#tag1", "tag1"},
+        {"#tag2", "tag2"},
+        {"#tag3", "tag3"},
+        {"#tag4", "tag4"},
+        {"#tag5", "tag5"},
+        {"#tag6", "tag6"},
+        {"#tag7", "tag7"},
+        {"#tag8", "tag8"},
+      ]
+
+      assert {_text, [], ^expected_tags} = Formatter.linkify(text)
+    end
   end
 
   test "it escapes HTML in plain text" do
-- 
cgit v1.2.3


From 31148c1857dae28377f9b864a9ebe143d99beb96 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 15 Jan 2022 12:31:36 -0600
Subject: FormatterTest: fix nesting in expected output

---
 test/pleroma/formatter_test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs
index 5b8babc83..045edf4b1 100644
--- a/test/pleroma/formatter_test.exs
+++ b/test/pleroma/formatter_test.exs
@@ -294,7 +294,7 @@ defmodule Pleroma.FormatterTest do
       assert length(mentions) == 1
 
       expected_text =
-        ~s(<p>Hello</p><p><span class="h-card"><a class="u-url mention" data-user="#{lain.id}" href="#{lain.ap_id}" rel="ugc">@<span>lain</span></a></p></span>)
+        ~s(<p>Hello</p><p><span class="h-card"><a class="u-url mention" data-user="#{lain.id}" href="#{lain.ap_id}" rel="ugc">@<span>lain</span></a></span></p>)
 
       assert expected_text == text
     end
-- 
cgit v1.2.3


From 39c5ebb1f634b691d06d607d91cbfc6b0741d541 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 15 Jan 2022 12:55:12 -0600
Subject: mix format

---
 test/pleroma/formatter_test.exs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs
index 045edf4b1..6663fdbc6 100644
--- a/test/pleroma/formatter_test.exs
+++ b/test/pleroma/formatter_test.exs
@@ -318,7 +318,7 @@ defmodule Pleroma.FormatterTest do
       text = "<p>This is a #test</p>"
 
       expected_tags = [
-        {"#test", "test"},
+        {"#test", "test"}
       ]
 
       assert {_text, [], ^expected_tags} = Formatter.linkify(text)
@@ -331,7 +331,7 @@ defmodule Pleroma.FormatterTest do
         {"#tag1", "tag1"},
         {"#tag2", "tag2"},
         {"#tag3", "tag3"},
-        {"#tag4", "tag4"},
+        {"#tag4", "tag4"}
       ]
 
       assert {_text, [], ^expected_tags} = Formatter.linkify(text)
@@ -341,14 +341,15 @@ defmodule Pleroma.FormatterTest do
       text = "<p>This is a</p><p>#test</p>"
 
       expected_tags = [
-        {"#test", "test"},
+        {"#test", "test"}
       ]
 
       assert {_text, [], ^expected_tags} = Formatter.linkify(text)
     end
 
     test "parses mulitple tags on mulitple lines in html" do
-      text = "<p>testing...</p><p>#tag1 #tag2 #tag3 #tag4</p><p>paragraph</p><p>#tag5 #tag6 #tag7 #tag8</p>"
+      text =
+        "<p>testing...</p><p>#tag1 #tag2 #tag3 #tag4</p><p>paragraph</p><p>#tag5 #tag6 #tag7 #tag8</p>"
 
       expected_tags = [
         {"#tag1", "tag1"},
@@ -358,7 +359,7 @@ defmodule Pleroma.FormatterTest do
         {"#tag5", "tag5"},
         {"#tag6", "tag6"},
         {"#tag7", "tag7"},
-        {"#tag8", "tag8"},
+        {"#tag8", "tag8"}
       ]
 
       assert {_text, [], ^expected_tags} = Formatter.linkify(text)
-- 
cgit v1.2.3