X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Ftasks%2Fuser_test.exs;h=b55aa1cdb8475bed2eb13239b1afa5246ddcd377;hb=f73b2063f484e83c0972527c00c42d4fbdd11a0c;hp=4b3ab5a877036666f5935c8e58ccb28b7bc87d34;hpb=63477d07adb614413a382a87f06af2bc2495b432;p=akkoma

diff --git a/test/tasks/user_test.exs b/test/tasks/user_test.exs
index 4b3ab5a87..b55aa1cdb 100644
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@ -91,6 +91,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
 
   describe "running rm" do
     test "user is deleted" do
+      clear_config([:instance, :federating], true)
       user = insert(:user)
 
       with_mock Pleroma.Web.Federator,
@@ -108,8 +109,10 @@ defmodule Mix.Tasks.Pleroma.UserTest do
 
     test "a remote user's create activity is deleted when the object has been pruned" do
       user = insert(:user)
+      {:ok, post} = CommonAPI.post(user, %{status: "uguu"})
+
+      clear_config([:instance, :federating], true)
 
-      {:ok, post} = CommonAPI.post(user, %{"status" => "uguu"})
       object = Object.normalize(post)
       Object.prune(object)
 
@@ -169,7 +172,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
     end
   end
 
-  describe "running unsubscribe" do
+  describe "running deactivate" do
     test "user is unsubscribed" do
       followed = insert(:user)
       remote_followed = insert(:user, local: false)
@@ -178,7 +181,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       User.follow(user, followed, :follow_accept)
       User.follow(user, remote_followed, :follow_accept)
 
-      Mix.Tasks.Pleroma.User.run(["unsubscribe", user.nickname])
+      Mix.Tasks.Pleroma.User.run(["deactivate", user.nickname])
 
       assert_received {:mix_shell, :info, [message]}
       assert message =~ "Deactivating"
@@ -192,8 +195,8 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       assert user.deactivated
     end
 
-    test "no user to unsubscribe" do
-      Mix.Tasks.Pleroma.User.run(["unsubscribe", "nonexistent"])
+    test "no user to deactivate" do
+      Mix.Tasks.Pleroma.User.run(["deactivate", "nonexistent"])
 
       assert_received {:mix_shell, :error, [message]}
       assert message =~ "No user"