X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=da880e67c5652e6b8d5dc6a94b69b20d6f6f73d7;hb=1af9c777365f3b54edcb572cea4e2e6f185b3099;hp=df1022d6bfaa2e27a51f80e893e46f3589923610;hpb=c7fdd1b7ff6e7a08389395d555862eaec9721b08;p=akkoma

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index df1022d6b..da880e67c 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -133,6 +133,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert {:error, "You need to specify screen_name or user_id"} == TwitterAPI.get_user(nil, nil)
     assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.id})
+    assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.nickname})
     assert user1_result == TwitterAPI.get_user(nil, %{"screen_name" => user1.nickname})
     assert user1_result == TwitterAPI.get_user(user1, nil)
     assert user1_result == TwitterAPI.get_user(user2, %{"user_id" => user1.id})
@@ -239,22 +240,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert is_binary(response)
   end
 
-  test "it can parse mentions and return the relevant users" do
-    text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
-
-    gsimg = insert(:user, %{nickname: "gsimg"})
-    archaeme = insert(:user, %{nickname: "archaeme"})
-    archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
-
-    expected_result = [
-      {"@gsimg", gsimg},
-      {"@archaeme", archaeme},
-      {"@archaeme@archae.me", archaeme_remote},
-    ]
-
-    assert TwitterAPI.parse_mentions(text) == expected_result
-  end
-
   test "it adds user links to an existing text" do
     text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
 
@@ -262,7 +247,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     archaeme = insert(:user, %{nickname: "archaeme"})
     archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
 
-    mentions = TwitterAPI.parse_mentions(text)
+    mentions = Pleroma.Formatter.parse_mentions(text)
     expected_text = "<a href='#{gsimg.ap_id}'>@gsimg</a> According to <a href='#{archaeme.ap_id}'>@archaeme</a>, that is @daggsy. Also hello <a href='#{archaeme_remote.ap_id}'>@archaeme</a>"
 
     assert Utils.add_user_links(text, mentions) == expected_text