logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 8e4f043ac72e4236f5690f34e3bdc7ce288005e6
parent 72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82
Author: Maksim Pechnikov <parallel588@gmail.com>
Date:   Tue, 22 Sep 2020 21:58:30 +0300

finland-emojis.zip -> emojis.zip

Diffstat:

Mtest/emoji/pack_test.exs8++++----
Atest/fixtures/emojis.zip0
Dtest/fixtures/finland-emojis.zip0
Mtest/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 @@ -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 Binary files differ. diff --git a/test/fixtures/finland-emojis.zip b/test/fixtures/finland-emojis.zip 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 @@ -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)