changes after rebase

2 files changed, 0 insertions, 113 deletions

diff --git a/test/user/import_test.exs b/test/user/import_test.exs
deleted file mode 100644
index e404deeb5..000000000
--- a/test/user/import_test.exs
+++ /dev/null
@@ -1,76 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.ImportTest do
-  alias Pleroma.Repo
-  alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.User
-
-  use Pleroma.DataCase
-  use Oban.Testing, repo: Pleroma.Repo
-
-  import Pleroma.Factory
-
-  setup_all do
-    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-    :ok
-  end
-
-  describe "follow_import" do
-    test "it imports user followings from list" do
-      [user1, user2, user3] = insert_list(3, :user)
-
-      identifiers = [
-        user2.ap_id,
-        user3.nickname
-      ]
-
-      {:ok, job} = User.Import.follow_import(user1, identifiers)
-
-      assert {:ok, result} = ObanHelpers.perform(job)
-      assert is_list(result)
-      assert result == [user2, user3]
-      assert User.following?(user1, user2)
-      assert User.following?(user1, user3)
-    end
-  end
-
-  describe "blocks_import" do
-    test "it imports user blocks from list" do
-      [user1, user2, user3] = insert_list(3, :user)
-
-      identifiers = [
-        user2.ap_id,
-        user3.nickname
-      ]
-
-      {:ok, job} = User.Import.blocks_import(user1, identifiers)
-
-      assert {:ok, result} = ObanHelpers.perform(job)
-      assert is_list(result)
-      assert result == [user2, user3]
-      assert User.blocks?(user1, user2)
-      assert User.blocks?(user1, user3)
-    end
-  end
-
-  describe "mutes_import" do
-    test "it imports user mutes from list" do
-      [user1, user2, user3] = insert_list(3, :user)
-
-      identifiers = [
-        user2.ap_id,
-        user3.nickname
-      ]
-
-      {:ok, job} = User.Import.mutes_import(user1, identifiers)
-
-      assert {:ok, result} = ObanHelpers.perform(job)
-      assert is_list(result)
-      assert result == [user2, user3]
-      assert User.mutes?(user1, user2)
-      assert User.mutes?(user1, user3)
-    end
-  end
-end
diff --git a/test/user/query_test.exs b/test/user/query_test.exs
deleted file mode 100644
index e2f5c7d81..000000000
--- a/test/user/query_test.exs
+++ /dev/null
@@ -1,37 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.QueryTest do
-  use Pleroma.DataCase, async: true
-
-  alias Pleroma.Repo
-  alias Pleroma.User
-  alias Pleroma.User.Query
-  alias Pleroma.Web.ActivityPub.InternalFetchActor
-
-  import Pleroma.Factory
-
-  describe "internal users" do
-    test "it filters out internal users by default" do
-      %User{nickname: "internal.fetch"} = InternalFetchActor.get_actor()
-
-      assert [_user] = User |> Repo.all()
-      assert [] == %{} |> Query.build() |> Repo.all()
-    end
-
-    test "it filters out users without nickname by default" do
-      insert(:user, %{nickname: nil})
-
-      assert [_user] = User |> Repo.all()
-      assert [] == %{} |> Query.build() |> Repo.all()
-    end
-
-    test "it returns internal users when enabled" do
-      %User{nickname: "internal.fetch"} = InternalFetchActor.get_actor()
-      insert(:user, %{nickname: nil})
-
-      assert %{internal: true} |> Query.build() |> Repo.aggregate(:count) == 2
-    end
-  end
-end