summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-09-22 21:58:30 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-09-22 21:58:30 +0300
commit8e4f043ac72e4236f5690f34e3bdc7ce288005e6 (patch)
treeb10a860d2288a636130a8ad89451de4aee02dbf6
parent72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82 (diff)
finland-emojis.zip -> emojis.zip
-rw-r--r--test/emoji/pack_test.exs8
-rw-r--r--test/fixtures/emojis.zipbin0 -> 1446 bytes
-rw-r--r--test/fixtures/finland-emojis.zipbin460250 -> 0 bytes
-rw-r--r--test/web/pleroma_api/controllers/emoji_file_controller_test.exs4
4 files changed, 6 insertions, 6 deletions
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
--- /dev/null
+++ b/test/fixtures/emojis.zip
Binary files differ
diff --git a/test/fixtures/finland-emojis.zip b/test/fixtures/finland-emojis.zip
deleted file mode 100644
index de7242ea1..000000000
--- a/test/fixtures/finland-emojis.zip
+++ /dev/null
Binary files 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)