diff options
| author | lain <lain@soykaf.club> | 2020-04-09 13:25:27 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-09 13:25:27 +0200 |
| commit | d35e114acddf339ed398aeab02bf94abe229ac36 (patch) | |
| tree | e35bbf60afa823fd1fdf2b0366249a31f040cd29 /test/web/mastodon_api/controllers/app_controller_test.exs | |
| parent | 8e637ae1a7b75fa08679ae9cf424650fc105de85 (diff) | |
| parent | b87b798ca1660224a3192c32b035c19b18e11587 (diff) | |
| download | pleroma-d35e114acddf339ed398aeab02bf94abe229ac36.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/web/mastodon_api/controllers/app_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/app_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/app_controller_test.exs b/test/web/mastodon_api/controllers/app_controller_test.exs index 77d234d67..e7b11d14e 100644 --- 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 - |> 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 @@ -37,6 +36,7 @@ defmodule Pleroma.Web.MastodonAPI.AppControllerTest do conn = conn + |> put_req_header("content-type", "application/json") |> assign(:user, user) |> post("/api/v1/apps", %{ client_name: app_attrs.client_name, |