projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
app_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/app_controller_test.exs
b/test/web/mastodon_api/controllers/app_controller_test.exs
index 77d234d67eea6675b3e7e9b90c501f175ccc734f..e7b11d14e1461fa910f72ddd73c8b5359a4f5b21 100644
(file)
--- a/
test/web/mastodon_api/controllers/app_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/app_controller_test.exs
@@
-16,8
+16,7
@@
defmodule Pleroma.Web.MastodonAPI.AppControllerTest do
conn =
conn
conn =
conn
- |> assign(:user, token.user)
- |> assign(:token, token)
+ |> put_req_header("authorization", "Bearer #{token.token}")
|> get("/api/v1/apps/verify_credentials")
app = Repo.preload(token, :app).app
|> get("/api/v1/apps/verify_credentials")
app = Repo.preload(token, :app).app
@@
-37,6
+36,7
@@
defmodule Pleroma.Web.MastodonAPI.AppControllerTest do
conn =
conn
conn =
conn
+ |> put_req_header("content-type", "application/json")
|> assign(:user, user)
|> post("/api/v1/apps", %{
client_name: app_attrs.client_name,
|> assign(:user, user)
|> post("/api/v1/apps", %{
client_name: app_attrs.client_name,