diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
| commit | 2a96283efbd46c017cf9e15ef4fda3188e5e5bca (patch) | |
| tree | 3265b9ff9f830a366d14870486c85ddcd08f51c9 /test/web/oauth/oauth_controller_test.exs | |
| parent | 273905744242b013ba9736ff7e1415a0499022d1 (diff) | |
| parent | 1344e34ed3a337b54e450af474f81e2f326bf768 (diff) | |
| download | pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.tar.gz pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
Diffstat (limited to 'test/web/oauth/oauth_controller_test.exs')
| -rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index ed94416ff..ff1e56fe9 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -132,11 +132,12 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do "client_secret" => app.client_secret }) - assert %{"access_token" => token} = json_response(conn, 200) + assert %{"access_token" => token, "me" => ap_id} = json_response(conn, 200) token = Repo.get_by(Token, token: token) assert token assert token.scopes == auth.scopes + assert user.ap_id == ap_id end test "issues a token for `password` grant_type with valid credentials, with full permissions by default" do |