X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Fstatus_view_test.exs;h=836a47db05418ef5d9596fe2497a7a1a34eeb41e;hb=641c24cdd46f36205d91a2de7da8bbbfa7aac3ce;hp=a12fc8244db58e4082de7e9a24d7dbf3d99c6678;hpb=fc10875895abd9add5a7834c4b5a64cc5b9401f8;p=akkoma

diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index a12fc8244..836a47db0 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -12,6 +12,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
     status = StatusView.render("status.json", %{activity: note})
 
+    created_at = (note.data["object"]["published"] || "")
+    |> String.replace(~r/\.\d+Z/, ".000Z")
+
     expected = %{
       id: note.id,
       uri: note.data["object"]["id"],
@@ -21,7 +24,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       in_reply_to_account_id: nil,
       reblog: nil,
       content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]),
-      created_at: note.data["object"]["published"],
+      created_at: created_at,
       reblogs_count: 0,
       favourites_count: 0,
       reblogged: false,
@@ -65,7 +68,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     }
 
     expected = %{
-      id: 6,
+      id: 1638338801,
       type: "image",
       url: "someurl",
       remote_url: "someurl",
@@ -73,5 +76,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     }
 
     assert expected == StatusView.render("attachment.json", %{attachment: object})
+
+    # If theres a "id", use that instead of the generated one
+    object = Map.put(object, "id", 2)
+    assert %{id: 2} = StatusView.render("attachment.json", %{attachment: object})
   end
 end