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

diff --git a/test/plugs/uploaded_media_plug_test.exs b/test/plugs/uploaded_media_plug_test.exs
deleted file mode 100644
index 20b13dfac..000000000
--- a/test/plugs/uploaded_media_plug_test.exs
+++ /dev/null
@@ -1,43 +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.UploadedMediaPlugTest do
-  use Pleroma.Web.ConnCase
-  alias Pleroma.Upload
-
-  defp upload_file(context) do
-    Pleroma.DataCase.ensure_local_uploader(context)
-    File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
-
-    file = %Plug.Upload{
-      content_type: "image/jpg",
-      path: Path.absname("test/fixtures/image_tmp.jpg"),
-      filename: "nice_tf.jpg"
-    }
-
-    {:ok, data} = Upload.store(file)
-    [%{"href" => attachment_url} | _] = data["url"]
-    [attachment_url: attachment_url]
-  end
-
-  setup_all :upload_file
-
-  test "does not send Content-Disposition header when name param is not set", %{
-    attachment_url: attachment_url
-  } do
-    conn = get(build_conn(), attachment_url)
-    refute Enum.any?(conn.resp_headers, &(elem(&1, 0) == "content-disposition"))
-  end
-
-  test "sends Content-Disposition header when name param is set", %{
-    attachment_url: attachment_url
-  } do
-    conn = get(build_conn(), attachment_url <> "?name=\"cofe\".gif")
-
-    assert Enum.any?(
-             conn.resp_headers,
-             &(&1 == {"content-disposition", "filename=\"\\\"cofe\\\".gif\""})
-           )
-  end
-end