Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator

2020-05-03 12:55:29 +02:00 · 2020-05-03 12:55:29 +02:00 · 6fb96f64c1
commit 6fb96f64c1
parent 4dfc617cdf 095635453a
156 changed files with 1597 additions and 747 deletions
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@ -97,7 +97,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do

        assert_received {:mix_shell, :info, [message]}
        assert message =~ " deleted"
-        refute User.get_by_nickname(user.nickname)
+        assert %{deactivated: true} = User.get_by_nickname(user.nickname)

        assert called(Pleroma.Web.Federator.publish(:_))
      end