Merge remote-tracking branch 'origin/develop' into matrixmatrix

2 files changed, 0 insertions, 433 deletions

diff --git a/test/web/feed/tag_controller_test.exs b/test/web/feed/tag_controller_test.exs
deleted file mode 100644
index 3c29cd94f..000000000
--- a/test/web/feed/tag_controller_test.exs
+++ /dev/null
@@ -1,184 +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.TagControllerTest do
-  use Pleroma.Web.ConnCase
-
-  import Pleroma.Factory
-  import SweetXml
-
-  alias Pleroma.Object
-  alias Pleroma.Web.CommonAPI
-  alias Pleroma.Web.Feed.FeedView
-
-  setup do: clear_config([:feed])
-
-  test "gets a feed (ATOM)", %{conn: conn} do
-    Pleroma.Config.put(
-      [:feed, :post_title],
-      %{max_length: 25, omission: "..."}
-    )
-
-    user = insert(:user)
-    {:ok, activity1} = CommonAPI.post(user, %{status: "yeah #PleromaArt"})
-
-    object = Object.normalize(activity1)
-
-    object_data =
-      Map.put(object.data, "attachment", [
-        %{
-          "url" => [
-            %{
-              "href" =>
-                "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4",
-              "mediaType" => "video/mp4",
-              "type" => "Link"
-            }
-          ]
-        }
-      ])
-
-    object
-    |> Ecto.Changeset.change(data: object_data)
-    |> Pleroma.Repo.update()
-
-    {:ok, activity2} = CommonAPI.post(user, %{status: "42 This is :moominmamma #PleromaArt"})
-
-    {:ok, _activity3} = CommonAPI.post(user, %{status: "This is :moominmamma"})
-
-    response =
-      conn
-      |> put_req_header("accept", "application/atom+xml")
-      |> get(tag_feed_path(conn, :feed, "pleromaart.atom"))
-      |> response(200)
-
-    xml = parse(response)
-
-    assert xpath(xml, ~x"//feed/title/text()") == '#pleromaart'
-
-    assert xpath(xml, ~x"//feed/entry/title/text()"l) == [
-             '42 This is :moominmamm...',
-             'yeah #PleromaArt'
-           ]
-
-    assert xpath(xml, ~x"//feed/entry/author/name/text()"ls) == [user.nickname, user.nickname]
-    assert xpath(xml, ~x"//feed/entry/author/id/text()"ls) == [user.ap_id, user.ap_id]
-
-    conn =
-      conn
-      |> put_req_header("accept", "application/atom+xml")
-      |> get("/tags/pleromaart.atom", %{"max_id" => activity2.id})
-
-    assert get_resp_header(conn, "content-type") == ["application/atom+xml; charset=utf-8"]
-    resp = response(conn, 200)
-    xml = parse(resp)
-
-    assert xpath(xml, ~x"//feed/title/text()") == '#pleromaart'
-
-    assert xpath(xml, ~x"//feed/entry/title/text()"l) == [
-             'yeah #PleromaArt'
-           ]
-  end
-
-  test "gets a feed (RSS)", %{conn: conn} do
-    Pleroma.Config.put(
-      [:feed, :post_title],
-      %{max_length: 25, omission: "..."}
-    )
-
-    user = insert(:user)
-    {:ok, activity1} = CommonAPI.post(user, %{status: "yeah #PleromaArt"})
-
-    object = Object.normalize(activity1)
-
-    object_data =
-      Map.put(object.data, "attachment", [
-        %{
-          "url" => [
-            %{
-              "href" =>
-                "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4",
-              "mediaType" => "video/mp4",
-              "type" => "Link"
-            }
-          ]
-        }
-      ])
-
-    object
-    |> Ecto.Changeset.change(data: object_data)
-    |> Pleroma.Repo.update()
-
-    {:ok, activity2} = CommonAPI.post(user, %{status: "42 This is :moominmamma #PleromaArt"})
-
-    {:ok, _activity3} = CommonAPI.post(user, %{status: "This is :moominmamma"})
-
-    response =
-      conn
-      |> put_req_header("accept", "application/rss+xml")
-      |> get(tag_feed_path(conn, :feed, "pleromaart.rss"))
-      |> response(200)
-
-    xml = parse(response)
-    assert xpath(xml, ~x"//channel/title/text()") == '#pleromaart'
-
-    assert xpath(xml, ~x"//channel/description/text()"s) ==
-             "These are public toots tagged with #pleromaart. You can interact with them if you have an account anywhere in the fediverse."
-
-    assert xpath(xml, ~x"//channel/link/text()") ==
-             '#{Pleroma.Web.base_url()}/tags/pleromaart.rss'
-
-    assert xpath(xml, ~x"//channel/webfeeds:logo/text()") ==
-             '#{Pleroma.Web.base_url()}/static/logo.png'
-
-    assert xpath(xml, ~x"//channel/item/title/text()"l) == [
-             '42 This is :moominmamm...',
-             'yeah #PleromaArt'
-           ]
-
-    assert xpath(xml, ~x"//channel/item/pubDate/text()"sl) == [
-             FeedView.pub_date(activity2.data["published"]),
-             FeedView.pub_date(activity1.data["published"])
-           ]
-
-    assert xpath(xml, ~x"//channel/item/enclosure/@url"sl) == [
-             "https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4"
-           ]
-
-    obj1 = Object.normalize(activity1)
-    obj2 = Object.normalize(activity2)
-
-    assert xpath(xml, ~x"//channel/item/description/text()"sl) == [
-             HtmlEntities.decode(FeedView.activity_content(obj2.data)),
-             HtmlEntities.decode(FeedView.activity_content(obj1.data))
-           ]
-
-    response =
-      conn
-      |> put_req_header("accept", "application/rss+xml")
-      |> get(tag_feed_path(conn, :feed, "pleromaart"))
-      |> response(200)
-
-    xml = parse(response)
-    assert xpath(xml, ~x"//channel/title/text()") == '#pleromaart'
-
-    assert xpath(xml, ~x"//channel/description/text()"s) ==
-             "These are public toots tagged with #pleromaart. You can interact with them if you have an account anywhere in the fediverse."
-
-    conn =
-      conn
-      |> put_req_header("accept", "application/rss+xml")
-      |> get("/tags/pleromaart.rss", %{"max_id" => activity2.id})
-
-    assert get_resp_header(conn, "content-type") == ["application/rss+xml; charset=utf-8"]
-    resp = response(conn, 200)
-    xml = parse(resp)
-
-    assert xpath(xml, ~x"//channel/title/text()") == '#pleromaart'
-
-    assert xpath(xml, ~x"//channel/item/title/text()"l) == [
-             'yeah #PleromaArt'
-           ]
-  end
-end
diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
deleted file mode 100644
index 0d2a61967..000000000
--- a/test/web/feed/user_controller_test.exs
+++ /dev/null
@@ -1,249 +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([:instance, :federating], true)
-
-  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
-  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
-end