X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fuser_test.exs;h=a3c75aa9bd8caa03c00413dd256ebe3c4f1254fd;hb=63a1a82f38d3d8a63dd7d52e1412446274c94722;hp=23afc605cd94770d704de482690657eb8da63778;hpb=93f64aba78f130cced2fa30dd3475e5c446be9d6;p=akkoma diff --git a/test/user_test.exs b/test/user_test.exs index 23afc605c..a3c75aa9b 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1134,16 +1134,7 @@ defmodule Pleroma.UserTest do refute Activity.get_by_id(activity.id) end - test "it deletes deactivated user" do - {:ok, user} = insert(:user, deactivated: true) |> User.set_cache() - - {:ok, job} = User.delete(user) - {:ok, _user} = ObanHelpers.perform(job) - - refute User.get_by_id(user.id) - end - - test "it deletes a user, all follow relationships and all activities", %{user: user} do + test "it deactivates a user, all follow relationships and all activities", %{user: user} do follower = insert(:user) {:ok, follower} = User.follow(follower, user) @@ -1163,8 +1154,7 @@ defmodule Pleroma.UserTest do follower = User.get_cached_by_id(follower.id) refute User.following?(follower, user) - refute User.get_by_id(user.id) - assert {:ok, nil} == Cachex.get(:user_cache, "ap_id:#{user.ap_id}") + assert %{deactivated: true} = User.get_by_id(user.id) user_activities = user.ap_id