Merge branch 'bugfix/relax-spam-protection' into 'develop'

[akkoma] / test / web / twitter_api / twitter_api_test.exs

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 798a009feb174236dc2529c764b4b6780e2af013..8781061d4c1fad7bb0a1b021fbde32a763a50fd1 100644 (file)
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -105,7 +105,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
              get_in(activity.data, ["object", "context"])
 
     assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
-    assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
+    assert Activity.get_in_reply_to_activity(reply).id == activity.id
   end
 
   test "Follow another user using user_id" do
@@ -325,7 +325,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert user.info.confirmation_pending
 
-    Swoosh.TestAssertions.assert_email_sent(Pleroma.UserEmail.account_confirmation_email(user))
+    Swoosh.TestAssertions.assert_email_sent(
+      Pleroma.Emails.UserEmail.account_confirmation_email(user)
+    )
   end
 
   test "it registers a new user and parses mentions in the bio" do
@@ -492,7 +494,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
       refute User.get_by_nickname("vinny")
       invite = Repo.get_by(UserInviteToken, token: invite.token)
 
-      assert invite.used == true
+      refute invite.used
     end
   end