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

diff --git a/test/web/web_finger/web_finger_controller_test.exs b/test/web/web_finger/web_finger_controller_test.exs
deleted file mode 100644
index 0023f1e81..000000000
--- a/test/web/web_finger/web_finger_controller_test.exs
+++ /dev/null
@@ -1,94 +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.WebFinger.WebFingerControllerTest do
-  use Pleroma.Web.ConnCase
-
-  import ExUnit.CaptureLog
-  import Pleroma.Factory
-  import Tesla.Mock
-
-  setup do
-    mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
-    :ok
-  end
-
-  setup_all do: clear_config([:instance, :federating], true)
-
-  test "GET host-meta" do
-    response =
-      build_conn()
-      |> get("/.well-known/host-meta")
-
-    assert response.status == 200
-
-    assert response.resp_body ==
-             ~s(<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" template="#{
-               Pleroma.Web.base_url()
-             }/.well-known/webfinger?resource={uri}" type="application/xrd+xml" /></XRD>)
-  end
-
-  test "Webfinger JRD" do
-    user = insert(:user)
-
-    response =
-      build_conn()
-      |> put_req_header("accept", "application/jrd+json")
-      |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
-
-    assert json_response(response, 200)["subject"] == "acct:#{user.nickname}@localhost"
-  end
-
-  test "it returns 404 when user isn't found (JSON)" do
-    result =
-      build_conn()
-      |> put_req_header("accept", "application/jrd+json")
-      |> get("/.well-known/webfinger?resource=acct:jimm@localhost")
-      |> json_response(404)
-
-    assert result == "Couldn't find user"
-  end
-
-  test "Webfinger XML" do
-    user = insert(:user)
-
-    response =
-      build_conn()
-      |> put_req_header("accept", "application/xrd+xml")
-      |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
-
-    assert response(response, 200)
-  end
-
-  test "it returns 404 when user isn't found (XML)" do
-    result =
-      build_conn()
-      |> put_req_header("accept", "application/xrd+xml")
-      |> get("/.well-known/webfinger?resource=acct:jimm@localhost")
-      |> response(404)
-
-    assert result == "Couldn't find user"
-  end
-
-  test "Sends a 404 when invalid format" do
-    user = insert(:user)
-
-    assert capture_log(fn ->
-             assert_raise Phoenix.NotAcceptableError, fn ->
-               build_conn()
-               |> put_req_header("accept", "text/html")
-               |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
-             end
-           end) =~ "no supported media type in accept header"
-  end
-
-  test "Sends a 400 when resource param is missing" do
-    response =
-      build_conn()
-      |> put_req_header("accept", "application/xrd+xml,application/jrd+json")
-      |> get("/.well-known/webfinger")
-
-    assert response(response, 400)
-  end
-end