Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 192 deletions

diff --git a/test/web/static_fe/static_fe_controller_test.exs b/test/web/static_fe/static_fe_controller_test.exs
deleted file mode 100644
index 1598bf675..000000000
--- a/test/web/static_fe/static_fe_controller_test.exs
+++ /dev/null
@@ -1,192 +0,0 @@
-defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
-  use Pleroma.Web.ConnCase
-
-  alias Pleroma.Activity
-  alias Pleroma.Config
-  alias Pleroma.Web.ActivityPub.Transmogrifier
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  setup_all do: clear_config([:static_fe, :enabled], true)
-  setup do: clear_config([:instance, :federating], true)
-
-  setup %{conn: conn} do
-    conn = put_req_header(conn, "accept", "text/html")
-    user = insert(:user)
-
-    %{conn: conn, user: user}
-  end
-
-  describe "user profile html" do
-    test "just the profile as HTML", %{conn: conn, user: user} do
-      conn = get(conn, "/users/#{user.nickname}")
-
-      assert html_response(conn, 200) =~ user.nickname
-    end
-
-    test "404 when user not found", %{conn: conn} do
-      conn = get(conn, "/users/limpopo")
-
-      assert html_response(conn, 404) =~ "not found"
-    end
-
-    test "profile does not include private messages", %{conn: conn, user: user} do
-      CommonAPI.post(user, %{status: "public"})
-      CommonAPI.post(user, %{status: "private", visibility: "private"})
-
-      conn = get(conn, "/users/#{user.nickname}")
-
-      html = html_response(conn, 200)
-
-      assert html =~ ">public<"
-      refute html =~ ">private<"
-    end
-
-    test "pagination", %{conn: conn, user: user} do
-      Enum.map(1..30, fn i -> CommonAPI.post(user, %{status: "test#{i}"}) end)
-
-      conn = get(conn, "/users/#{user.nickname}")
-
-      html = html_response(conn, 200)
-
-      assert html =~ ">test30<"
-      assert html =~ ">test11<"
-      refute html =~ ">test10<"
-      refute html =~ ">test1<"
-    end
-
-    test "pagination, page 2", %{conn: conn, user: user} do
-      activities = Enum.map(1..30, fn i -> CommonAPI.post(user, %{status: "test#{i}"}) end)
-      {:ok, a11} = Enum.at(activities, 11)
-
-      conn = get(conn, "/users/#{user.nickname}?max_id=#{a11.id}")
-
-      html = html_response(conn, 200)
-
-      assert html =~ ">test1<"
-      assert html =~ ">test10<"
-      refute html =~ ">test20<"
-      refute html =~ ">test29<"
-    end
-
-    test "it requires authentication if instance is NOT federating", %{conn: conn, user: user} do
-      ensure_federating_or_authenticated(conn, "/users/#{user.nickname}", user)
-    end
-  end
-
-  describe "notice html" do
-    test "single notice page", %{conn: conn, user: user} do
-      {:ok, activity} = CommonAPI.post(user, %{status: "testing a thing!"})
-
-      conn = get(conn, "/notice/#{activity.id}")
-
-      html = html_response(conn, 200)
-      assert html =~ "<header>"
-      assert html =~ user.nickname
-      assert html =~ "testing a thing!"
-    end
-
-    test "redirects to json if requested", %{conn: conn, user: user} do
-      {:ok, activity} = CommonAPI.post(user, %{status: "testing a thing!"})
-
-      conn =
-        conn
-        |> put_req_header(
-          "accept",
-          "Accept: application/activity+json, application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\", text/html"
-        )
-        |> get("/notice/#{activity.id}")
-
-      assert redirected_to(conn, 302) =~ activity.data["object"]
-    end
-
-    test "filters HTML tags", %{conn: conn} do
-      user = insert(:user)
-      {:ok, activity} = CommonAPI.post(user, %{status: "<script>alert('xss')</script>"})
-
-      conn =
-        conn
-        |> put_req_header("accept", "text/html")
-        |> get("/notice/#{activity.id}")
-
-      html = html_response(conn, 200)
-      assert html =~ ~s[&lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;]
-    end
-
-    test "shows the whole thread", %{conn: conn, user: user} do
-      {:ok, activity} = CommonAPI.post(user, %{status: "space: the final frontier"})
-
-      CommonAPI.post(user, %{
-        status: "these are the voyages or something",
-        in_reply_to_status_id: activity.id
-      })
-
-      conn = get(conn, "/notice/#{activity.id}")
-
-      html = html_response(conn, 200)
-      assert html =~ "the final frontier"
-      assert html =~ "voyages"
-    end
-
-    test "redirect by AP object ID", %{conn: conn, user: user} do
-      {:ok, %Activity{data: %{"object" => object_url}}} =
-        CommonAPI.post(user, %{status: "beam me up"})
-
-      conn = get(conn, URI.parse(object_url).path)
-
-      assert html_response(conn, 302) =~ "redirected"
-    end
-
-    test "redirect by activity ID", %{conn: conn, user: user} do
-      {:ok, %Activity{data: %{"id" => id}}} =
-        CommonAPI.post(user, %{status: "I'm a doctor, not a devops!"})
-
-      conn = get(conn, URI.parse(id).path)
-
-      assert html_response(conn, 302) =~ "redirected"
-    end
-
-    test "404 when notice not found", %{conn: conn} do
-      conn = get(conn, "/notice/88c9c317")
-
-      assert html_response(conn, 404) =~ "not found"
-    end
-
-    test "404 for private status", %{conn: conn, user: user} do
-      {:ok, activity} = CommonAPI.post(user, %{status: "don't show me!", visibility: "private"})
-
-      conn = get(conn, "/notice/#{activity.id}")
-
-      assert html_response(conn, 404) =~ "not found"
-    end
-
-    test "302 for remote cached status", %{conn: conn, user: user} do
-      message = %{
-        "@context" => "https://www.w3.org/ns/activitystreams",
-        "to" => user.follower_address,
-        "cc" => "https://www.w3.org/ns/activitystreams#Public",
-        "type" => "Create",
-        "object" => %{
-          "content" => "blah blah blah",
-          "type" => "Note",
-          "attributedTo" => user.ap_id,
-          "inReplyTo" => nil
-        },
-        "actor" => user.ap_id
-      }
-
-      assert {:ok, activity} = Transmogrifier.handle_incoming(message)
-
-      conn = get(conn, "/notice/#{activity.id}")
-
-      assert html_response(conn, 302) =~ "redirected"
-    end
-
-    test "it requires authentication if instance is NOT federating", %{conn: conn, user: user} do
-      {:ok, activity} = CommonAPI.post(user, %{status: "testing a thing!"})
-
-      ensure_federating_or_authenticated(conn, "/notice/#{activity.id}", user)
-    end
-  end
-end