projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
twitter_api
/
password_controller_test.exs
diff --git
a/test/pleroma/web/twitter_api/password_controller_test.exs
b/test/pleroma/web/twitter_api/password_controller_test.exs
index 6d08075cc5187e4b36eae23ab1d4f3237f11a2ac..c1f5bc5c7f08f37a5d23e29d2dad9a60360c1b1f 100644
(file)
--- a/
test/pleroma/web/twitter_api/password_controller_test.exs
+++ b/
test/pleroma/web/twitter_api/password_controller_test.exs
@@
-37,8
+37,7
@@
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
-
- :timer.sleep(2000)
+ {:ok, token} = time_travel(token, -2)
response =
conn
response =
conn
@@
-55,7
+54,7
@@
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
-
:timer.sleep(2000
)
+
{:ok, token} = time_travel(token, -2
)
{:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{
{:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{