projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'issue/1975'
[akkoma]
/
test
/
emoji
/
pack_test.exs
diff --git
a/test/emoji/pack_test.exs
b/test/emoji/pack_test.exs
index 3ec991f0fe89a06a38e1d50729b9965bc0d22d0f..70d1eaa1b638d58df8891892be48018a751fa1b0 100644
(file)
--- 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",
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)
}
{: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",
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")
}
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",
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")
}
path: Path.absname("test/fixtures/empty.zip")
}