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

diff --git a/test/plugs/instance_static_test.exs b/test/plugs/instance_static_test.exs
deleted file mode 100644
index d42ba817e..000000000
--- a/test/plugs/instance_static_test.exs
+++ /dev/null
@@ -1,65 +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.InstanceStaticPlugTest do
-  use Pleroma.Web.ConnCase
-
-  @dir "test/tmp/instance_static"
-
-  setup do
-    File.mkdir_p!(@dir)
-    on_exit(fn -> File.rm_rf(@dir) end)
-  end
-
-  setup do: clear_config([:instance, :static_dir], @dir)
-
-  test "overrides index" do
-    bundled_index = get(build_conn(), "/")
-    refute html_response(bundled_index, 200) == "hello world"
-
-    File.write!(@dir <> "/index.html", "hello world")
-
-    index = get(build_conn(), "/")
-    assert html_response(index, 200) == "hello world"
-  end
-
-  test "also overrides frontend files", %{conn: conn} do
-    name = "pelmora"
-    ref = "uguu"
-
-    clear_config([:frontends, :primary], %{"name" => name, "ref" => ref})
-
-    bundled_index = get(conn, "/")
-    refute html_response(bundled_index, 200) == "from frontend plug"
-
-    path = "#{@dir}/frontends/#{name}/#{ref}"
-    File.mkdir_p!(path)
-    File.write!("#{path}/index.html", "from frontend plug")
-
-    index = get(conn, "/")
-    assert html_response(index, 200) == "from frontend plug"
-
-    File.write!(@dir <> "/index.html", "from instance static")
-
-    index = get(conn, "/")
-    assert html_response(index, 200) == "from instance static"
-  end
-
-  test "overrides any file in static/static" do
-    bundled_index = get(build_conn(), "/static/terms-of-service.html")
-
-    assert html_response(bundled_index, 200) ==
-             File.read!("priv/static/static/terms-of-service.html")
-
-    File.mkdir!(@dir <> "/static")
-    File.write!(@dir <> "/static/terms-of-service.html", "plz be kind")
-
-    index = get(build_conn(), "/static/terms-of-service.html")
-    assert html_response(index, 200) == "plz be kind"
-
-    File.write!(@dir <> "/static/kaniini.html", "<h1>rabbit hugs as a service</h1>")
-    index = get(build_conn(), "/static/kaniini.html")
-    assert html_response(index, 200) == "<h1>rabbit hugs as a service</h1>"
-  end
-end