projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
status_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 633a25e506b1ee3cdf779bcf81d8423956966424..436608e515094a3733a02d5ec294b25e6cac582d 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@
-167,7
+167,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
test "posting an undefined status with an attachment", %{user: user, conn: conn} do
file = %Plug.Upload{
test "posting an undefined status with an attachment", %{user: user, conn: conn} do
file = %Plug.Upload{
- content_type: "image/jpg",
+ content_type: "image/jp
e
g",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
@@
-408,7
+408,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
|> Kernel.<>("Z")
file = %Plug.Upload{
|> Kernel.<>("Z")
file = %Plug.Upload{
- content_type: "image/jpg",
+ content_type: "image/jp
e
g",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
@@
-937,7
+937,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
|> get("/api/v1/statuses/#{reblog_activity1.id}")
assert %{
|> get("/api/v1/statuses/#{reblog_activity1.id}")
assert %{
- "reblog" => %{"id" => id, "reblogged" => false, "reblogs_count" => 2},
+ "reblog" => %{"id" =>
_
id, "reblogged" => false, "reblogs_count" => 2},
"reblogged" => false,
"favourited" => false,
"bookmarked" => false
"reblogged" => false,
"favourited" => false,
"bookmarked" => false