Merge branch 'develop' into feature/activitypub

1 files changed, 67 insertions, 0 deletions

diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 886af6b66..18a19ef70 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -50,6 +50,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "profile_image_url_profile_size" => image,
       "profile_image_url_original" => image,
       "following" => false,
+      "follows_you" => false,
+      "statusnet_blocking" => false,
       "rights" => %{},
       "statusnet_profile_url" => user.ap_id,
       "cover_photo" => nil,
@@ -78,6 +80,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "profile_image_url_profile_size" => image,
       "profile_image_url_original" => image,
       "following" => true,
+      "follows_you" => false,
+      "statusnet_blocking" => false,
       "rights" => %{},
       "statusnet_profile_url" => user.ap_id,
       "cover_photo" => nil,
@@ -86,4 +90,67 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
 
     assert represented == UserView.render("show.json", %{user: user, for: follower})
   end
+
+  test "A user that follows you", %{user: user} do
+    follower = insert(:user)
+    {:ok, follower} = User.follow(follower, user)
+    {:ok, user} = User.update_follower_count(user)
+    image = "https://placehold.it/48x48"
+    represented = %{
+      "id" => follower.id,
+      "name" => follower.name,
+      "screen_name" => follower.nickname,
+      "description" => HtmlSanitizeEx.strip_tags(follower.bio),
+      "created_at" => follower.inserted_at |> Utils.format_naive_asctime,
+      "favourites_count" => 0,
+      "statuses_count" => 0,
+      "friends_count" => 1,
+      "followers_count" => 0,
+      "profile_image_url" => image,
+      "profile_image_url_https" => image,
+      "profile_image_url_profile_size" => image,
+      "profile_image_url_original" => image,
+      "following" => false,
+      "follows_you" => true,
+      "statusnet_blocking" => false,
+      "rights" => %{},
+      "statusnet_profile_url" => follower.ap_id,
+      "cover_photo" => nil,
+      "background_image" => nil
+    }
+
+    assert represented == UserView.render("show.json", %{user: follower, for: user})
+  end
+
+  test "A blocked user for the blocker", %{user: user} do
+    user = insert(:user)
+    blocker = insert(:user)
+    User.block(blocker, user)
+    image = "https://placehold.it/48x48"
+    represented = %{
+      "id" => user.id,
+      "name" => user.name,
+      "screen_name" => user.nickname,
+      "description" => HtmlSanitizeEx.strip_tags(user.bio),
+      "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+      "favourites_count" => 0,
+      "statuses_count" => 0,
+      "friends_count" => 0,
+      "followers_count" => 0,
+      "profile_image_url" => image,
+      "profile_image_url_https" => image,
+      "profile_image_url_profile_size" => image,
+      "profile_image_url_original" => image,
+      "following" => false,
+      "follows_you" => false,
+      "statusnet_blocking" => true,
+      "rights" => %{},
+      "statusnet_profile_url" => user.ap_id,
+      "cover_photo" => nil,
+      "background_image" => nil
+    }
+
+    blocker = Repo.get(User, blocker.id)
+    assert represented == UserView.render("show.json", %{user: user, for: blocker})
+  end
 end