X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Fstatus_view_test.exs;h=870a205f110c5d30d663370aebcdb0fc52d0539b;hb=9f0a2a714b498edfbacc638fa79e06e3a8dc4d04;hp=a12fc8244db58e4082de7e9a24d7dbf3d99c6678;hpb=f0d41a3abf3e584c90c96644f73d533ea0680237;p=akkoma

diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index a12fc8244..870a205f1 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -2,7 +2,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
   use Pleroma.DataCase
 
   alias Pleroma.Web.MastodonAPI.{StatusView, AccountView}
-  alias Pleroma.{User, Object}
+  alias Pleroma.User
   alias Pleroma.Web.OStatus
   import Pleroma.Factory
 
@@ -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,
@@ -33,7 +36,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       media_attachments: [],
       mentions: [],
       tags: [],
-      application: nil,
+      application: %{
+        name: "Web",
+        website: nil
+      },
       language: nil
     }
 
@@ -52,7 +58,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
   end
 
   test "attachments" do
-    incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
     object = %{
       "type" => "Image",
       "url" => [
@@ -65,13 +70,18 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     }
 
     expected = %{
-      id: 6,
+      id: 1638338801,
       type: "image",
       url: "someurl",
       remote_url: "someurl",
-      preview_url: "someurl"
+      preview_url: "someurl",
+      text_url: "someurl"
     }
 
     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