X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Faccount_view_test.exs;h=597690bf74913d0f04e811595df3be8c7a7a7ce8;hb=bfce29866fea3ec7ab91a6b1f20a845248fa0130;hp=259258281c8bb731ab9a5c27c9845e9278840698;hpb=49929321c761cf389d42ca52d88dc8ec09a375cc;p=akkoma

diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index 259258281..597690bf7 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -5,24 +5,34 @@ 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"})
+    user =
+      insert(:user, %{
+        info: %{"note_count" => 5, "follower_count" => 3},
+        nickname: "shp@shitposter.club",
+        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,
       locked: false,
-      created_at: user.inserted_at,
+      created_at: "2017-08-15T15:47:06.000Z",
       followers_count: 3,
       following_count: 0,
       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",
+      source: %{
+        note: "",
+        privacy: "public",
+        sensitive: "false"
+      }
     }
 
     assert expected == AccountView.render("account.json", %{user: user})
@@ -32,7 +42,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 +56,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: false,
-      followed_by: true,
-      blocking: false,
+      id: to_string(other_user.id),
+      following: true,
+      followed_by: false,
+      blocking: true,
       muting: false,
       requested: false,
       domain_blocking: false