diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
| commit | 7f692343c80ddf353712490edfbcdb14866f5685 (patch) | |
| tree | 7ef90078d87fafb1eb25986c92af17a9eede37be /test/web/mastodon_api/controllers/app_controller_test.exs | |
| parent | fc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-7f692343c80ddf353712490edfbcdb14866f5685.tar.gz pleroma-7f692343c80ddf353712490edfbcdb14866f5685.zip | |
Merge branch 'develop' into global-status-expiration
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, |