Merge branch 'develop' into issue/1383

1 files changed, 14 insertions, 1 deletions

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 087bdbcc2..37f8bb800 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -119,7 +119,20 @@ defmodule Pleroma.FormatterTest do
     end
   end
 
-  describe "add_user_links" do
+  describe "Formatter.linkify" do
+    test "correctly finds mentions that contain the domain name" do
+      _user = insert(:user, %{nickname: "lain"})
+      _remote_user = insert(:user, %{nickname: "lain@lain.com", local: false})
+
+      text = "hey @lain@lain.com what's up"
+
+      {_text, mentions, []} = Formatter.linkify(text)
+      [{username, user}] = mentions
+
+      assert username == "@lain@lain.com"
+      assert user.nickname == "lain@lain.com"
+    end
+
     test "gives a replacement for user links, using local nicknames in user links text" do
       text = "@gsimg According to @archa_eme_, that is @daggsy. Also hello @archaeme@archae.me"
       gsimg = insert(:user, %{nickname: "gsimg"})