diff options
| author | lain <lain@soykaf.club> | 2020-04-09 09:48:56 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-09 09:48:56 +0000 |
| commit | d2e21fbc968fbbeb98e9860e1dce77443f4b4cd4 (patch) | |
| tree | 3c6433a6ece4dc263da52d7b0994c0430c94709d /test/web/mastodon_api/controllers | |
| parent | 564f3f01caa66b4632ef9e30f4f896478b1ac131 (diff) | |
| parent | 03eebabe8e5b2e3f96f6ffe51a6f063a42f6a5d2 (diff) | |
| download | pleroma-d2e21fbc968fbbeb98e9860e1dce77443f4b4cd4.tar.gz pleroma-d2e21fbc968fbbeb98e9860e1dce77443f4b4cd4.zip | |
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
Diffstat (limited to 'test/web/mastodon_api/controllers')
| -rw-r--r-- | test/web/mastodon_api/controllers/account_controller_test.exs | 4 | ||||
| -rw-r--r-- | test/web/mastodon_api/controllers/app_controller_test.exs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs index a9fa0ce48..a450a732c 100644 --- a/test/web/mastodon_api/controllers/account_controller_test.exs +++ b/test/web/mastodon_api/controllers/account_controller_test.exs @@ -794,7 +794,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do test "Account registration via Application", %{conn: conn} do conn = - post(conn, "/api/v1/apps", %{ + conn + |> put_req_header("content-type", "application/json") + |> post("/api/v1/apps", %{ client_name: "client_name", redirect_uris: "urn:ietf:wg:oauth:2.0:oob", scopes: "read, write, follow" 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, |