Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test

2 files changed, 17 insertions, 4 deletions

diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index a9129bccc..d0cccb149 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -45,8 +45,11 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
 
   test "an activity" do
     {:ok, user} = UserBuilder.insert
-    {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
-    {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+    #   {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
+    mentioned_user = insert(:user, %{nickname: "shp"})
+
+    # {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+    follower = insert(:user, %{following: [User.ap_followers(user)]})
 
     object = %Object{
       data: %{
@@ -62,7 +65,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       }
     }
 
-    content_html = "Some content mentioning <a href='shp'>@shp</shp>"
+    content_html = "Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
     content = HtmlSanitizeEx.strip_tags(content_html)
     date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
 
diff --git a/test/web/twitter_api/representers/user_representer_test.exs b/test/web/twitter_api/representers/user_representer_test.exs
index 76e3bd6e6..913d1322c 100644
--- a/test/web/twitter_api/representers/user_representer_test.exs
+++ b/test/web/twitter_api/representers/user_representer_test.exs
@@ -5,13 +5,23 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do
   alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter
   alias Pleroma.Builders.UserBuilder
 
+  import Pleroma.Factory
+
   setup do
-    {:ok, user} = UserBuilder.insert
+    user = insert(:user)
     [user: user]
   end
 
+  test "A user with an avatar object", %{user: user} do
+    image = "image"
+    user = %{ user | avatar: %{ "url" => [%{"href" => image}] }}
+    represented = UserRepresenter.to_map(user)
+    assert represented["profile_image_url"] == image
+  end
+
   test "A user", %{user: user} do
     image = "https://placehold.it/48x48"
+
     represented = %{
       "id" => user.id,
       "name" => user.name,