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

1 files changed, 0 insertions, 39 deletions

diff --git a/test/web/activity_pub/object_validators/block_validation_test.exs b/test/web/activity_pub/object_validators/block_validation_test.exs
deleted file mode 100644
index c08d4b2e8..000000000
--- a/test/web/activity_pub/object_validators/block_validation_test.exs
+++ /dev/null
@@ -1,39 +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.ActivityPub.ObjectValidators.BlockValidationTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.ActivityPub.Builder
-  alias Pleroma.Web.ActivityPub.ObjectValidator
-
-  import Pleroma.Factory
-
-  describe "blocks" do
-    setup do
-      user = insert(:user, local: false)
-      blocked = insert(:user)
-
-      {:ok, valid_block, []} = Builder.block(user, blocked)
-
-      %{user: user, valid_block: valid_block}
-    end
-
-    test "validates a basic object", %{
-      valid_block: valid_block
-    } do
-      assert {:ok, _block, []} = ObjectValidator.validate(valid_block, [])
-    end
-
-    test "returns an error if we don't know the blocked user", %{
-      valid_block: valid_block
-    } do
-      block =
-        valid_block
-        |> Map.put("object", "https://gensokyo.2hu/users/raymoo")
-
-      assert {:error, _cng} = ObjectValidator.validate(block, [])
-    end
-  end
-end