hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change YAML to JSON

Browse source
This commit is contained in:
Ekaterina Vaartis 2019-08-15 11:39:39 +03:00
commit 2a94eca096
9 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/instance_static/emoji/test_pack/pack.json Normal file
View file

@ -0,0 +1,16 @@
{
"pack": {
"license": "Test license",
"homepage": "https://pleroma.social",
"description": "Test description",
"fallblack-src": "https://example.com",
"fallback-src-sha256": "65CDCCBCA9388A68023519F997367783BE69ED42864398CAC568E56F65CE0E75",
"share-files": true
},
"files": {
"blank": "blank.png"
}
}

13
test/instance_static/emoji/test_pack/pack.yml
View file

@ -1,13 +0,0 @@
pack:
license: Test license
homepage: https://pleroma.social
description: Test description
fallblack-src: https://example.com
# SHA256 of the fallback-src
fallback-src-sha256: 65CDCCBCA9388A68023519F997367783BE69ED42864398CAC568E56F65CE0E75
share-files: true
files:
blank: blank.png

16
test/instance_static/emoji/test_pack_nonshared/pack.json Normal file
View file

@ -0,0 +1,16 @@
{
"pack": {
"license": "Test license",
"homepage": "https://pleroma.social",
"description": "Test description",
"fallblack-src": "https://example.com",
"fallback-src-sha256": "65CDCCBCA9388A68023519F997367783BE69ED42864398CAC568E56F65CE0E75",
"share-files": false
},
"files": {
"blank": "blank.png"
}
}

13
test/instance_static/emoji/test_pack_nonshared/pack.yml
View file

@ -1,13 +0,0 @@
pack:
license: Test license
homepage: https://pleroma.social
description: Test description
fallblack-src: https://example.com
# SHA256 of the fallback-src
fallback-src-sha256: 65CDCCBCA9388A68023519F997367783BE69ED42864398CAC568E56F65CE0E75
share-files: false
files:
blank: blank.png

4
test/web/emoji_api_controller_test.exs
View file

@ -38,7 +38,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest do
{:ok, arch} = :zip.unzip(resp, [:memory])
assert Enum.find(arch, fn {n, _} -> n == 'pack.yml' end)
assert Enum.find(arch, fn {n, _} -> n == 'pack.json' end)
assert Enum.find(arch, fn {n, _} -> n == 'blank.png' end)
end
@ -92,7 +92,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest do
)
|> text_response(200) == "ok"
assert File.exists?("test/instance_static/emoji/test_pack2/pack.yml")
assert File.exists?("test/instance_static/emoji/test_pack2/pack.json")
assert File.exists?("test/instance_static/emoji/test_pack2/blank.png")
assert conn