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, 48 deletions

diff --git a/test/web/preload/instance_test.exs b/test/web/preload/instance_test.exs
deleted file mode 100644
index a46f28312..000000000
--- a/test/web/preload/instance_test.exs
+++ /dev/null
@@ -1,48 +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.InstanceTest do
-  use Pleroma.DataCase
-  alias Pleroma.Web.Preload.Providers.Instance
-
-  setup do: {:ok, Instance.generate_terms(nil)}
-
-  test "it renders the info", %{"/api/v1/instance" => info} do
-    assert %{
-             description: description,
-             email: "admin@example.com",
-             registrations: true
-           } = info
-
-    assert String.equivalent?(description, "Pleroma: An efficient and flexible fediverse server")
-  end
-
-  test "it renders the panel", %{"/instance/panel.html" => panel} do
-    assert String.contains?(
-             panel,
-             "<p>Welcome to <a href=\"https://pleroma.social\" target=\"_blank\">Pleroma!</a></p>"
-           )
-  end
-
-  test "it works with overrides" do
-    clear_config([:instance, :static_dir], "test/fixtures/preload_static")
-
-    %{"/instance/panel.html" => panel} = Instance.generate_terms(nil)
-
-    assert String.contains?(
-             panel,
-             "HEY!"
-           )
-  end
-
-  test "it renders the node_info", %{"/nodeinfo/2.0.json" => nodeinfo} do
-    %{
-      metadata: metadata,
-      version: "2.0"
-    } = nodeinfo
-
-    assert metadata.private == false
-    assert metadata.suggestions == %{enabled: false}
-  end
-end