diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
| commit | 648cc699e551324a067cd1b906df5f497ade5861 (patch) | |
| tree | 3ddcee32eb0b61770709422aaa266167a8254e28 /test/web/mastodon_api/controllers/app_controller_test.exs | |
| parent | 591f7015d91b383dae1ee29576d13c0fad65cad6 (diff) | |
| parent | c433ed9dbb1db9777f235527e06c9c8bec3b1436 (diff) | |
| download | pleroma-648cc699e551324a067cd1b906df5f497ade5861.tar.gz pleroma-648cc699e551324a067cd1b906df5f497ade5861.zip | |
Merge branch 'develop' into support/update_oban
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, |