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 'remotes/origin/develop' into chore/elixir-1.11
[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 497a6bb1207814a09be483c9c322a4462b33eeb3..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"
}