summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/password_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-09-11 17:19:58 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-09-11 17:19:58 +0300
commit0bda85857e8f320ee7b91d8203fd621e1e2d5180 (patch)
treec77346be760cff6c3f50eceee778ef43a4bd252a /test/web/twitter_api/password_controller_test.exs
parent4d18a50f3c4b6654339a6a8df71160e23b45cac0 (diff)
parent9fb88c814ddadd9138ef29550a856938491a1ca4 (diff)
downloadpleroma-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/web/twitter_api/password_controller_test.exs')
-rw-r--r--test/web/twitter_api/password_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/password_controller_test.exs b/test/web/twitter_api/password_controller_test.exs
index 231a46c67..a5e9e2178 100644
--- a/test/web/twitter_api/password_controller_test.exs
+++ b/test/web/twitter_api/password_controller_test.exs
@@ -37,7 +37,7 @@ defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
test "it returns HTTP 200", %{conn: conn} do
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
- {:ok, _access_token} = Token.create_token(insert(:oauth_app), user, %{})
+ {:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{
"password" => "test",
@@ -62,7 +62,7 @@ defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
user = insert(:user, password_reset_pending: true)
{:ok, token} = PasswordResetToken.create_token(user)
- {:ok, _access_token} = Token.create_token(insert(:oauth_app), user, %{})
+ {:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{
"password" => "test",