projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into attachment-meta
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view_test.exs
diff --git
a/test/pleroma/web/mastodon_api/views/status_view_test.exs
b/test/pleroma/web/mastodon_api/views/status_view_test.exs
index 2de3afc4fb15f59dfb3f2b58ba584409fd09f678..9dfdf8bf064da99035d867dc7f2a022cb84fc0f9 100644
(file)
--- a/
test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/
test/pleroma/web/mastodon_api/views/status_view_test.exs
@@
-262,8
+262,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
mentions: [],
tags: [
%{
mentions: [],
tags: [
%{
- name: "#{
object_data["tag"]
}",
- url: "http://localhost:4001/tag/#{
object_data["tag"]
}"
+ name: "#{
hd(object_data["tag"])
}",
+ url: "http://localhost:4001/tag/#{
hd(object_data["tag"])
}"
}
],
application: nil,
}
],
application: nil,
@@
-286,7
+286,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
direct_conversation_id: nil,
thread_muted: false,
emoji_reactions: [],
direct_conversation_id: nil,
thread_muted: false,
emoji_reactions: [],
- parent_visible: false
+ parent_visible: false,
+ pinned_at: nil
}
}
}
}
@@
-458,7
+459,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
"url" => [
%{
"mediaType" => "image/png",
"url" => [
%{
"mediaType" => "image/png",
- "href" => "someurl"
+ "href" => "someurl",
+ "width" => 200,
+ "height" => 100
}
],
"blurhash" => "UJJ8X[xYW,%Jtq%NNFbXB5j]IVM|9GV=WHRn",
}
],
"blurhash" => "UJJ8X[xYW,%Jtq%NNFbXB5j]IVM|9GV=WHRn",
@@
-474,6
+477,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
text_url: "someurl",
description: nil,
pleroma: %{mime_type: "image/png"},
text_url: "someurl",
description: nil,
pleroma: %{mime_type: "image/png"},
+ meta: %{original: %{width: 200, height: 100, aspect: 2}},
blurhash: "UJJ8X[xYW,%Jtq%NNFbXB5j]IVM|9GV=WHRn"
}
blurhash: "UJJ8X[xYW,%Jtq%NNFbXB5j]IVM|9GV=WHRn"
}