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

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 55 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