summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-12-05 11:27:11 +0000
committerlambda <pleromagit@rogerbraun.net>2017-12-05 11:27:11 +0000
commit08e7e249b1e656bce79fec7df4ce8bf9b158855f (patch)
tree6ffaad6b46925bd1bf5f5aff53437df7ed0528b1 /test/web/twitter_api/twitter_api_controller_test.exs
parent7f336cb8b102c4dd5045aceebedafa1ca363bd91 (diff)
parente7c2472abd470b3b0ba8e9321a378e5a77412e26 (diff)
downloadpleroma-08e7e249b1e656bce79fec7df4ce8bf9b158855f.tar.gz
pleroma-08e7e249b1e656bce79fec7df4ce8bf9b158855f.zip
Merge branch 'feature/chat' into 'develop'
Feature/chat See merge request pleroma/pleroma!36
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs3
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