diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-11 17:19:58 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-11 17:19:58 +0300 |
commit | 0bda85857e8f320ee7b91d8203fd621e1e2d5180 (patch) | |
tree | c77346be760cff6c3f50eceee778ef43a4bd252a /test/plugs/oauth_plug_test.exs | |
parent | 4d18a50f3c4b6654339a6a8df71160e23b45cac0 (diff) | |
parent | 9fb88c814ddadd9138ef29550a856938491a1ca4 (diff) | |
download | pleroma-0bda85857e8f320ee7b91d8203fd621e1e2d5180.tar.gz pleroma-0bda85857e8f320ee7b91d8203fd621e1e2d5180.zip |
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
Diffstat (limited to 'test/plugs/oauth_plug_test.exs')
-rw-r--r-- | test/plugs/oauth_plug_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/plugs/oauth_plug_test.exs b/test/plugs/oauth_plug_test.exs index f74c068cd..9d39d3153 100644 --- a/test/plugs/oauth_plug_test.exs +++ b/test/plugs/oauth_plug_test.exs @@ -16,7 +16,7 @@ defmodule Pleroma.Plugs.OAuthPlugTest do setup %{conn: conn} do user = insert(:user) - {:ok, %{token: token}} = Pleroma.Web.OAuth.Token.create_token(insert(:oauth_app), user) + {:ok, %{token: token}} = Pleroma.Web.OAuth.Token.create(insert(:oauth_app), user) %{user: user, token: token, conn: conn} end |