Merge branch 'develop' into feature/activitypub

1 files changed, 25 insertions, 14 deletions

diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 18a19ef70..d5d2f0adc 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -30,10 +30,11 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
     User.follow(follower, user)
     User.follow(second_follower, user)
     User.follow(user, follower)
+    {:ok, user} = User.update_follower_count(user)
+    Cachex.set(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
 
-    user = Repo.get!(User, user.id)
-
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
 
     represented = %{
       "id" => user.id,
@@ -54,8 +55,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "statusnet_blocking" => false,
       "rights" => %{},
       "statusnet_profile_url" => user.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     assert represented == UserView.render("show.json", %{user: user})
@@ -64,7 +66,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
   test "A user for a given other follower", %{user: user} do
     {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
     {:ok, user} = User.update_follower_count(user)
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
     represented = %{
       "id" => user.id,
       "name" => user.name,
@@ -84,8 +88,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "statusnet_blocking" => false,
       "rights" => %{},
       "statusnet_profile_url" => user.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     assert represented == UserView.render("show.json", %{user: user, for: follower})
@@ -95,7 +100,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
     follower = insert(:user)
     {:ok, follower} = User.follow(follower, user)
     {:ok, user} = User.update_follower_count(user)
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
     represented = %{
       "id" => follower.id,
       "name" => follower.name,
@@ -115,8 +122,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "statusnet_blocking" => false,
       "rights" => %{},
       "statusnet_profile_url" => follower.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     assert represented == UserView.render("show.json", %{user: follower, for: user})
@@ -126,7 +134,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
     user = insert(:user)
     blocker = insert(:user)
     User.block(blocker, user)
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
     represented = %{
       "id" => user.id,
       "name" => user.name,
@@ -146,8 +156,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "statusnet_blocking" => true,
       "rights" => %{},
       "statusnet_profile_url" => user.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     blocker = Repo.get(User, blocker.id)