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

diff --git a/test/web/views/error_view_test.exs b/test/web/views/error_view_test.exs
deleted file mode 100644
index 8dbbd18b4..000000000
--- a/test/web/views/error_view_test.exs
+++ /dev/null
@@ -1,36 +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.ErrorViewTest do
-  use Pleroma.Web.ConnCase, async: true
-  import ExUnit.CaptureLog
-
-  # Bring render/3 and render_to_string/3 for testing custom views
-  import Phoenix.View
-
-  test "renders 404.json" do
-    assert render(Pleroma.Web.ErrorView, "404.json", []) == %{errors: %{detail: "Page not found"}}
-  end
-
-  test "render 500.json" do
-    assert capture_log(fn ->
-             assert render(Pleroma.Web.ErrorView, "500.json", []) ==
-                      %{errors: %{detail: "Internal server error", reason: "nil"}}
-           end) =~ "[error] Internal server error: nil"
-  end
-
-  test "render any other" do
-    assert capture_log(fn ->
-             assert render(Pleroma.Web.ErrorView, "505.json", []) ==
-                      %{errors: %{detail: "Internal server error", reason: "nil"}}
-           end) =~ "[error] Internal server error: nil"
-  end
-
-  test "render 500.json with reason" do
-    assert capture_log(fn ->
-             assert render(Pleroma.Web.ErrorView, "500.json", reason: "test reason") ==
-                      %{errors: %{detail: "Internal server error", reason: "\"test reason\""}}
-           end) =~ "[error] Internal server error: \"test reason\""
-  end
-end