Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 32 deletions

diff --git a/test/web/metadata/utils_test.exs b/test/web/metadata/utils_test.exs
deleted file mode 100644
index 8183256d8..000000000
--- a/test/web/metadata/utils_test.exs
+++ /dev/null
@@ -1,32 +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.Metadata.UtilsTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  alias Pleroma.Web.Metadata.Utils
-
-  describe "scrub_html_and_truncate/1" do
-    test "it returns text without encode HTML" do
-      user = insert(:user)
-
-      note =
-        insert(:note, %{
-          data: %{
-            "actor" => user.ap_id,
-            "id" => "https://pleroma.gov/objects/whatever",
-            "content" => "Pleroma's really cool!"
-          }
-        })
-
-      assert Utils.scrub_html_and_truncate(note) == "Pleroma's really cool!"
-    end
-  end
-
-  describe "scrub_html_and_truncate/2" do
-    test "it returns text without encode HTML" do
-      assert Utils.scrub_html_and_truncate("Pleroma's really cool!") == "Pleroma's really cool!"
-    end
-  end
-end