X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Faccount_view_test.exs;h=8bf194e6b98e8a81f6e6c8c56c78b6456efc5168;hb=ed9738e031e02a9338bedd3a8f3ff73329c101e7;hp=8a7727369a3588144181a485f079e0c5d9749f75;hpb=d659fcc1957600e7937af7e9a456af8bc452bbd8;p=akkoma

diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index 8a7727369..8bf194e6b 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -5,10 +5,26 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   alias Pleroma.User
 
   test "Represent a user account" do
-    user = insert(:user, %{info: %{"note_count" => 5, "follower_count" => 3}, nickname: "shp@shitposter.club", inserted_at: ~N[2017-08-15 15:47:06.597036]})
+    source_data = %{
+      "tag" => [
+        %{
+          "type" => "Emoji",
+          "icon" => %{"url" => "/file.png"},
+          "name" => ":karjalanpiirakka:"
+        }
+      ]
+    }
+
+    user =
+      insert(:user, %{
+        info: %{"note_count" => 5, "follower_count" => 3, "source_data" => source_data},
+        nickname: "shp@shitposter.club",
+        name: ":karjalanpiirakka: shp",
+        inserted_at: ~N[2017-08-15 15:47:06.597036]
+      })
 
     expected = %{
-      id: user.id,
+      id: to_string(user.id),
       username: "shp",
       acct: user.nickname,
       display_name: user.name,
@@ -19,10 +35,24 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       statuses_count: 5,
       note: user.bio,
       url: user.ap_id,
-      avatar: "https://placehold.it/48x48",
-      avatar_static: "https://placehold.it/48x48",
-      header: "https://placehold.it/700x335",
-      header_static: "https://placehold.it/700x335"
+      avatar: "http://localhost:4001/images/avi.png",
+      avatar_static: "http://localhost:4001/images/avi.png",
+      header: "http://localhost:4001/images/banner.png",
+      header_static: "http://localhost:4001/images/banner.png",
+      emojis: [
+        %{
+          "static_url" => "/file.png",
+          "url" => "/file.png",
+          "shortcode" => "karjalanpiirakka",
+          "visible_in_picker" => false
+        }
+      ],
+      fields: [],
+      source: %{
+        note: "",
+        privacy: "public",
+        sensitive: "false"
+      }
     }
 
     assert expected == AccountView.render("account.json", %{user: user})
@@ -32,7 +62,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     user = insert(:user)
 
     expected = %{
-      id: user.id,
+      id: to_string(user.id),
       acct: user.nickname,
       username: user.nickname,
       url: user.ap_id
@@ -46,12 +76,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     other_user = insert(:user)
 
     {:ok, user} = User.follow(user, other_user)
+    {:ok, user} = User.block(user, other_user)
 
     expected = %{
-      id: other_user.id,
-      following: true,
+      id: to_string(other_user.id),
+      following: false,
       followed_by: false,
-      blocking: false,
+      blocking: true,
       muting: false,
       requested: false,
       domain_blocking: false