projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into mutes-blocks-pagination
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
account_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
index 69f2b6f4a063ff7a64dd6a9da8aac04bcb14cfa3..c86223b264fbce22456af83add7ad973360053c3 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
@@
-380,7
+380,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
other_user = insert(:user)
file = %Plug.Upload{
other_user = insert(:user)
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"
}
@@
-706,7
+706,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
test "cancelling follow request", %{conn: conn} do
end
test "cancelling follow request", %{conn: conn} do
- %{id: other_user_id} = insert(:user, %{locked: true})
+ %{id: other_user_id} = insert(:user, %{
is_
locked: true})
assert %{"id" => ^other_user_id, "following" => false, "requested" => true} =
conn
assert %{"id" => ^other_user_id, "following" => false, "requested" => true} =
conn