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

diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
deleted file mode 100644
index 7383e82cc..000000000
--- a/test/web/feed/user_controller_test.exs
+++ /dev/null
@@ -1,275 +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.Feed.UserControllerTest do
-  use Pleroma.Web.ConnCase
-
-  import Pleroma.Factory
-  import SweetXml
-
-  alias Pleroma.Config
-  alias Pleroma.Object
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  setup do: clear_config([:static_fe, :enabled], false)
-
-  describe "feed" do
-    setup do: clear_config([:feed])
-
-    test "gets an atom feed", %{conn: conn} do
-      Config.put(
-        [:feed, :post_title],
-        %{max_length: 10, omission: "..."}
-      )
-
-      activity = insert(:note_activity)
-
-      note =
-        insert(:note,
-          data: %{
-            "content" => "This is :moominmamma: note ",
-            "attachment" => [
-              %{
-                "url" => [
-                  %{"mediaType" => "image/png", "href" => "https://pleroma.gov/image.png"}
-                ]
-              }
-            ],
-            "inReplyTo" => activity.data["id"]
-          }
-        )
-
-      note_activity = insert(:note_activity, note: note)
-      user = User.get_cached_by_ap_id(note_activity.data["actor"])
-
-      note2 =
-        insert(:note,
-          user: user,
-          data: %{
-            "content" => "42 This is :moominmamma: note ",
-            "inReplyTo" => activity.data["id"]
-          }
-        )
-
-      note_activity2 = insert(:note_activity, note: note2)
-      object = Object.normalize(note_activity)
-
-      resp =
-        conn
-        |> put_req_header("accept", "application/atom+xml")
-        |> get(user_feed_path(conn, :feed, user.nickname))
-        |> response(200)
-
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//entry/title/text()"l)
-
-      assert activity_titles == ['42 This...', 'This is...']
-      assert resp =~ object.data["content"]
-
-      resp =
-        conn
-        |> put_req_header("accept", "application/atom+xml")
-        |> get("/users/#{user.nickname}/feed", %{"max_id" => note_activity2.id})
-        |> response(200)
-
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//entry/title/text()"l)
-
-      assert activity_titles == ['This is...']
-    end
-
-    test "gets a rss feed", %{conn: conn} do
-      Pleroma.Config.put(
-        [:feed, :post_title],
-        %{max_length: 10, omission: "..."}
-      )
-
-      activity = insert(:note_activity)
-
-      note =
-        insert(:note,
-          data: %{
-            "content" => "This is :moominmamma: note ",
-            "attachment" => [
-              %{
-                "url" => [
-                  %{"mediaType" => "image/png", "href" => "https://pleroma.gov/image.png"}
-                ]
-              }
-            ],
-            "inReplyTo" => activity.data["id"]
-          }
-        )
-
-      note_activity = insert(:note_activity, note: note)
-      user = User.get_cached_by_ap_id(note_activity.data["actor"])
-
-      note2 =
-        insert(:note,
-          user: user,
-          data: %{
-            "content" => "42 This is :moominmamma: note ",
-            "inReplyTo" => activity.data["id"]
-          }
-        )
-
-      note_activity2 = insert(:note_activity, note: note2)
-      object = Object.normalize(note_activity)
-
-      resp =
-        conn
-        |> put_req_header("accept", "application/rss+xml")
-        |> get("/users/#{user.nickname}/feed.rss")
-        |> response(200)
-
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//item/title/text()"l)
-
-      assert activity_titles == ['42 This...', 'This is...']
-      assert resp =~ object.data["content"]
-
-      resp =
-        conn
-        |> put_req_header("accept", "application/rss+xml")
-        |> get("/users/#{user.nickname}/feed.rss", %{"max_id" => note_activity2.id})
-        |> response(200)
-
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//item/title/text()"l)
-
-      assert activity_titles == ['This is...']
-    end
-
-    test "returns 404 for a missing feed", %{conn: conn} do
-      conn =
-        conn
-        |> put_req_header("accept", "application/atom+xml")
-        |> get(user_feed_path(conn, :feed, "nonexisting"))
-
-      assert response(conn, 404)
-    end
-
-    test "returns feed with public and unlisted activities", %{conn: conn} do
-      user = insert(:user)
-
-      {:ok, _} = CommonAPI.post(user, %{status: "public", visibility: "public"})
-      {:ok, _} = CommonAPI.post(user, %{status: "direct", visibility: "direct"})
-      {:ok, _} = CommonAPI.post(user, %{status: "unlisted", visibility: "unlisted"})
-      {:ok, _} = CommonAPI.post(user, %{status: "private", visibility: "private"})
-
-      resp =
-        conn
-        |> put_req_header("accept", "application/atom+xml")
-        |> get(user_feed_path(conn, :feed, user.nickname))
-        |> response(200)
-
-      activity_titles =
-        resp
-        |> SweetXml.parse()
-        |> SweetXml.xpath(~x"//entry/title/text()"l)
-        |> Enum.sort()
-
-      assert activity_titles == ['public', 'unlisted']
-    end
-
-    test "returns 404 when the user is remote", %{conn: conn} do
-      user = insert(:user, local: false)
-
-      {:ok, _} = CommonAPI.post(user, %{status: "test"})
-
-      assert conn
-             |> put_req_header("accept", "application/atom+xml")
-             |> get(user_feed_path(conn, :feed, user.nickname))
-             |> response(404)
-    end
-
-    test "does not require authentication on non-federating instances", %{conn: conn} do
-      clear_config([:instance, :federating], false)
-      user = insert(:user)
-
-      conn
-      |> put_req_header("accept", "application/rss+xml")
-      |> get("/users/#{user.nickname}/feed.rss")
-      |> response(200)
-    end
-  end
-
-  # Note: see ActivityPubControllerTest for JSON format tests
-  describe "feed_redirect" do
-    test "with html format, it redirects to user feed", %{conn: conn} do
-      note_activity = insert(:note_activity)
-      user = User.get_cached_by_ap_id(note_activity.data["actor"])
-
-      response =
-        conn
-        |> get("/users/#{user.nickname}")
-        |> response(200)
-
-      assert response ==
-               Fallback.RedirectController.redirector_with_meta(
-                 conn,
-                 %{user: user}
-               ).resp_body
-    end
-
-    test "with html format, it returns error when user is not found", %{conn: conn} do
-      response =
-        conn
-        |> get("/users/jimm")
-        |> json_response(404)
-
-      assert response == %{"error" => "Not found"}
-    end
-
-    test "with non-html / non-json format, it redirects to user feed in atom format", %{
-      conn: conn
-    } do
-      note_activity = insert(:note_activity)
-      user = User.get_cached_by_ap_id(note_activity.data["actor"])
-
-      conn =
-        conn
-        |> put_req_header("accept", "application/xml")
-        |> get("/users/#{user.nickname}")
-
-      assert conn.status == 302
-      assert redirected_to(conn) == "#{Pleroma.Web.base_url()}/users/#{user.nickname}/feed.atom"
-    end
-
-    test "with non-html / non-json format, it returns error when user is not found", %{conn: conn} do
-      response =
-        conn
-        |> put_req_header("accept", "application/xml")
-        |> get(user_feed_path(conn, :feed, "jimm"))
-        |> response(404)
-
-      assert response == ~S({"error":"Not found"})
-    end
-  end
-
-  describe "private instance" do
-    setup do: clear_config([:instance, :public])
-
-    test "returns 404 for user feed", %{conn: conn} do
-      Config.put([:instance, :public], false)
-      user = insert(:user)
-
-      {:ok, _} = CommonAPI.post(user, %{status: "test"})
-
-      assert conn
-             |> put_req_header("accept", "application/atom+xml")
-             |> get(user_feed_path(conn, :feed, user.nickname))
-             |> response(404)
-    end
-  end
-end