From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 22 Sep 2020 18:58:30 +0000 (+0300)
Subject: finland-emojis.zip -> emojis.zip
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8e4f043ac72e4236f5690f34e3bdc7ce288005e6;p=akkoma

finland-emojis.zip -> emojis.zip
---

diff --git a/test/emoji/pack_test.exs b/test/emoji/pack_test.exs
index 3ec991f0f..70d1eaa1b 100644
--- a/test/emoji/pack_test.exs
+++ b/test/emoji/pack_test.exs
@@ -37,8 +37,8 @@ defmodule Pleroma.Emoji.PackTest do
     test "add emojies from zip file", %{pack: pack} do
       file = %Plug.Upload{
         content_type: "application/zip",
-        filename: "finland-emojis.zip",
-        path: Path.absname("test/fixtures/finland-emojis.zip")
+        filename: "emojis.zip",
+        path: Path.absname("test/fixtures/emojis.zip")
       }
 
       {:ok, updated_pack} = Pack.add_file(pack, nil, nil, file)
@@ -58,7 +58,7 @@ defmodule Pleroma.Emoji.PackTest do
   test "returns error when zip file is bad", %{pack: pack} do
     file = %Plug.Upload{
       content_type: "application/zip",
-      filename: "finland-emojis.zip",
+      filename: "emojis.zip",
       path: Path.absname("test/instance_static/emoji/test_pack/blank.png")
     }
 
@@ -68,7 +68,7 @@ defmodule Pleroma.Emoji.PackTest do
   test "returns pack when zip file is empty", %{pack: pack} do
     file = %Plug.Upload{
       content_type: "application/zip",
-      filename: "finland-emojis.zip",
+      filename: "emojis.zip",
       path: Path.absname("test/fixtures/empty.zip")
     }
 
diff --git a/test/fixtures/emojis.zip b/test/fixtures/emojis.zip
new file mode 100644
index 000000000..d7fc4732b
Binary files /dev/null and b/test/fixtures/emojis.zip differ
diff --git a/test/fixtures/finland-emojis.zip b/test/fixtures/finland-emojis.zip
deleted file mode 100644
index de7242ea1..000000000
Binary files a/test/fixtures/finland-emojis.zip and /dev/null differ
diff --git a/test/web/pleroma_api/controllers/emoji_file_controller_test.exs b/test/web/pleroma_api/controllers/emoji_file_controller_test.exs
index 827a4c374..39b4e1dac 100644
--- a/test/web/pleroma_api/controllers/emoji_file_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_file_controller_test.exs
@@ -59,8 +59,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiFileControllerTest do
         |> post("/api/pleroma/emoji/packs/test_pack/files", %{
           file: %Plug.Upload{
             content_type: "application/zip",
-            filename: "finland-emojis.zip",
-            path: Path.absname("test/fixtures/finland-emojis.zip")
+            filename: "emojis.zip",
+            path: Path.absname("test/fixtures/emojis.zip")
           }
         })
         |> json_response_and_validate_schema(200)