Merge remote-tracking branch 'upstream/develop' into block-behavior

1 files changed, 0 insertions, 33 deletions

diff --git a/test/web/preload/user_test.exs b/test/web/preload/user_test.exs
deleted file mode 100644
index 83f065e27..000000000
--- a/test/web/preload/user_test.exs
+++ /dev/null
@@ -1,33 +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.Web.Preload.Providers.UserTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  alias Pleroma.Web.Preload.Providers.User
-
-  describe "returns empty when user doesn't exist" do
-    test "nil user specified" do
-      assert User.generate_terms(%{user: nil}) == %{}
-    end
-
-    test "missing user specified" do
-      assert User.generate_terms(%{user: :not_a_user}) == %{}
-    end
-  end
-
-  describe "specified user exists" do
-    setup do
-      user = insert(:user)
-
-      terms = User.generate_terms(%{user: user})
-      %{terms: terms, user: user}
-    end
-
-    test "account is rendered", %{terms: terms, user: user} do
-      account = terms["/api/v1/accounts/#{user.id}"]
-      assert %{acct: user, username: user} = account
-    end
-  end
-end