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

diff --git a/test/tasks/uploads_test.exs b/test/tasks/uploads_test.exs
deleted file mode 100644
index d69e149a8..000000000
--- a/test/tasks/uploads_test.exs
+++ /dev/null
@@ -1,56 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.UploadsTest do
-  alias Pleroma.Upload
-  use Pleroma.DataCase
-
-  import Mock
-
-  setup_all do
-    Mix.shell(Mix.Shell.Process)
-
-    on_exit(fn ->
-      Mix.shell(Mix.Shell.IO)
-    end)
-
-    :ok
-  end
-
-  describe "running migrate_local" do
-    test "uploads migrated" do
-      with_mock Upload,
-        store: fn %Upload{name: _file, path: _path}, _opts -> {:ok, %{}} end do
-        Mix.Tasks.Pleroma.Uploads.run(["migrate_local", "S3"])
-
-        assert_received {:mix_shell, :info, [message]}
-        assert message =~ "Migrating files from local"
-
-        assert_received {:mix_shell, :info, [message]}
-
-        assert %{"total_count" => total_count} =
-                 Regex.named_captures(~r"^Found (?<total_count>\d+) uploads$", message)
-
-        assert_received {:mix_shell, :info, [message]}
-
-        # @logevery in Mix.Tasks.Pleroma.Uploads
-        count =
-          min(50, String.to_integer(total_count))
-          |> to_string()
-
-        assert %{"count" => ^count, "total_count" => ^total_count} =
-                 Regex.named_captures(
-                   ~r"^Uploaded (?<count>\d+)/(?<total_count>\d+) files$",
-                   message
-                 )
-      end
-    end
-
-    test "nonexistent uploader" do
-      assert_raise RuntimeError, ~r/The uploader .* is not an existing/, fn ->
-        Mix.Tasks.Pleroma.Uploads.run(["migrate_local", "nonexistent"])
-      end
-    end
-  end
-end