From 7c235b8874d575cb1582b1fca2817a8db492bf4c Mon Sep 17 00:00:00 2001
From: link0ff <juri@linkov.net>
Date: Sun, 16 Dec 2018 18:04:31 +0200
Subject: Add more Mix task tests in relay_test.exs and uploads_test.exs.
 Rename test/tasks/user.exs to test/tasks/user_test.exs.

---
 test/tasks/uploads_test.exs | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 test/tasks/uploads_test.exs

(limited to 'test/tasks/uploads_test.exs')

diff --git a/test/tasks/uploads_test.exs b/test/tasks/uploads_test.exs
new file mode 100644
index 000000000..a76e96df5
--- /dev/null
+++ b/test/tasks/uploads_test.exs
@@ -0,0 +1,47 @@
+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]}
+
+        assert %{"count" => ^total_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
-- 
cgit v1.2.3


From 52bda3b456528e14bb9765660aa957d31f41e54c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 17 Dec 2018 20:55:24 +0100
Subject: Fix uploads test.

---
 test/tasks/uploads_test.exs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'test/tasks/uploads_test.exs')

diff --git a/test/tasks/uploads_test.exs b/test/tasks/uploads_test.exs
index a76e96df5..93035abb6 100644
--- a/test/tasks/uploads_test.exs
+++ b/test/tasks/uploads_test.exs
@@ -30,7 +30,12 @@ defmodule Mix.Tasks.Pleroma.UploadsTest do
 
         assert_received {:mix_shell, :info, [message]}
 
-        assert %{"count" => ^total_count, "total_count" => ^total_count} =
+        # @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
-- 
cgit v1.2.3


From 3c08d229db423052d0dd88b8a36fb39b0ae81ead Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 23 Dec 2018 20:11:29 +0000
Subject: tests: add legal boilerplate

---
 test/tasks/uploads_test.exs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test/tasks/uploads_test.exs')

diff --git a/test/tasks/uploads_test.exs b/test/tasks/uploads_test.exs
index 93035abb6..b0b8eda11 100644
--- a/test/tasks/uploads_test.exs
+++ b/test/tasks/uploads_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Mix.Tasks.Pleroma.UploadsTest do
   alias Pleroma.Upload
   use Pleroma.DataCase
-- 
cgit v1.2.3