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

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

2 files changed, 0 insertions, 143 deletions

diff --git a/test/uploaders/local_test.exs b/test/uploaders/local_test.exs
deleted file mode 100644
index 18122ff6c..000000000
--- a/test/uploaders/local_test.exs
+++ /dev/null
@@ -1,55 +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.Uploaders.LocalTest do
-  use Pleroma.DataCase
-  alias Pleroma.Uploaders.Local
-
-  describe "get_file/1" do
-    test "it returns path to local folder for files" do
-      assert Local.get_file("") == {:ok, {:static_dir, "test/uploads"}}
-    end
-  end
-
-  describe "put_file/1" do
-    test "put file to local folder" do
-      File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
-      file_path = "local_upload/files/image.jpg"
-
-      file = %Pleroma.Upload{
-        name: "image.jpg",
-        content_type: "image/jpg",
-        path: file_path,
-        tempfile: Path.absname("test/fixtures/image_tmp.jpg")
-      }
-
-      assert Local.put_file(file) == :ok
-
-      assert Path.join([Local.upload_path(), file_path])
-             |> File.exists?()
-    end
-  end
-
-  describe "delete_file/1" do
-    test "deletes local file" do
-      File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
-      file_path = "local_upload/files/image.jpg"
-
-      file = %Pleroma.Upload{
-        name: "image.jpg",
-        content_type: "image/jpg",
-        path: file_path,
-        tempfile: Path.absname("test/fixtures/image_tmp.jpg")
-      }
-
-      :ok = Local.put_file(file)
-      local_path = Path.join([Local.upload_path(), file_path])
-      assert File.exists?(local_path)
-
-      Local.delete_file(file_path)
-
-      refute File.exists?(local_path)
-    end
-  end
-end
diff --git a/test/uploaders/s3_test.exs b/test/uploaders/s3_test.exs
deleted file mode 100644
index d949c90a5..000000000
--- a/test/uploaders/s3_test.exs
+++ /dev/null
@@ -1,88 +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.Uploaders.S3Test do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.Uploaders.S3
-
-  import Mock
-  import ExUnit.CaptureLog
-
-  setup do:
-          clear_config(Pleroma.Uploaders.S3,
-            bucket: "test_bucket",
-            public_endpoint: "https://s3.amazonaws.com"
-          )
-
-  describe "get_file/1" do
-    test "it returns path to local folder for files" do
-      assert S3.get_file("test_image.jpg") == {
-               :ok,
-               {:url, "https://s3.amazonaws.com/test_bucket/test_image.jpg"}
-             }
-    end
-
-    test "it returns path without bucket when truncated_namespace set to ''" do
-      Config.put([Pleroma.Uploaders.S3],
-        bucket: "test_bucket",
-        public_endpoint: "https://s3.amazonaws.com",
-        truncated_namespace: ""
-      )
-
-      assert S3.get_file("test_image.jpg") == {
-               :ok,
-               {:url, "https://s3.amazonaws.com/test_image.jpg"}
-             }
-    end
-
-    test "it returns path with bucket namespace when namespace is set" do
-      Config.put([Pleroma.Uploaders.S3],
-        bucket: "test_bucket",
-        public_endpoint: "https://s3.amazonaws.com",
-        bucket_namespace: "family"
-      )
-
-      assert S3.get_file("test_image.jpg") == {
-               :ok,
-               {:url, "https://s3.amazonaws.com/family:test_bucket/test_image.jpg"}
-             }
-    end
-  end
-
-  describe "put_file/1" do
-    setup do
-      file_upload = %Pleroma.Upload{
-        name: "image-tet.jpg",
-        content_type: "image/jpg",
-        path: "test_folder/image-tet.jpg",
-        tempfile: Path.absname("test/instance_static/add/shortcode.png")
-      }
-
-      [file_upload: file_upload]
-    end
-
-    test "save file", %{file_upload: file_upload} do
-      with_mock ExAws, request: fn _ -> {:ok, :ok} end do
-        assert S3.put_file(file_upload) == {:ok, {:file, "test_folder/image-tet.jpg"}}
-      end
-    end
-
-    test "returns error", %{file_upload: file_upload} do
-      with_mock ExAws, request: fn _ -> {:error, "S3 Upload failed"} end do
-        assert capture_log(fn ->
-                 assert S3.put_file(file_upload) == {:error, "S3 Upload failed"}
-               end) =~ "Elixir.Pleroma.Uploaders.S3: {:error, \"S3 Upload failed\"}"
-      end
-    end
-  end
-
-  describe "delete_file/1" do
-    test_with_mock "deletes file", ExAws, request: fn _req -> {:ok, %{status_code: 204}} end do
-      assert :ok = S3.delete_file("image.jpg")
-      assert_called(ExAws.request(:_))
-    end
-  end
-end