diff options
| author | href <href@random.sh> | 2017-12-05 14:12:15 +0100 |
|---|---|---|
| committer | href <href@random.sh> | 2017-12-05 14:12:15 +0100 |
| commit | 72f7baa6548dbd5cc5ae4c37d9c2e53126203449 (patch) | |
| tree | a4923155f8740e8570be4400785a72d8cd6e6bbc /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 1cb5cbdc6c1cd065e90961a9d538cb72610ae481 (diff) | |
| parent | 08e7e249b1e656bce79fec7df4ce8bf9b158855f (diff) | |
| download | pleroma-72f7baa6548dbd5cc5ae4c37d9c2e53126203449.tar.gz pleroma-72f7baa6548dbd5cc5ae4c37d9c2e53126203449.zip | |
Merge remote-tracking branch 'upstream/develop' into media-proxy
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index d12ade132..90d0fa654 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -22,7 +22,8 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do |> with_credentials(user.nickname, "test") |> post("/api/account/verify_credentials.json") - assert json_response(conn, 200) == UserView.render("show.json", %{user: user}) + assert response = json_response(conn, 200) + assert response == UserView.render("show.json", %{user: user, token: response["token"]}) end end |