summaryrefslogtreecommitdiff
path: root/test/instance_static
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-09-30 17:41:20 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-09-30 17:41:20 +0300
commit6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (patch)
treedd1b2129f3eb7df7b0141cc65ba6c492a36863d0 /test/instance_static
parentc98e761d28812818971d327800f1fc4c2baa2dbc (diff)
parenta22a7437d84065192601f73da73d2c27111c9b15 (diff)
downloadpleroma-6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745.tar.gz
pleroma-6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745.zip
[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'test/instance_static')
-rw-r--r--test/instance_static/emoji/test_pack/blank.pngbin0 -> 95 bytes
-rw-r--r--test/instance_static/emoji/test_pack/pack.json13
-rw-r--r--test/instance_static/emoji/test_pack_for_import/blank.pngbin0 -> 95 bytes
-rw-r--r--test/instance_static/emoji/test_pack_nonshared/nonshared.zipbin0 -> 256 bytes
-rw-r--r--test/instance_static/emoji/test_pack_nonshared/pack.json16
5 files changed, 29 insertions, 0 deletions
diff --git a/test/instance_static/emoji/test_pack/blank.png b/test/instance_static/emoji/test_pack/blank.png
new file mode 100644
index 000000000..8f50fa023
--- /dev/null
+++ b/test/instance_static/emoji/test_pack/blank.png
Binary files differ
diff --git a/test/instance_static/emoji/test_pack/pack.json b/test/instance_static/emoji/test_pack/pack.json
new file mode 100644
index 000000000..5a8ee75f9
--- /dev/null
+++ b/test/instance_static/emoji/test_pack/pack.json
@@ -0,0 +1,13 @@
+{
+ "pack": {
+ "license": "Test license",
+ "homepage": "https://pleroma.social",
+ "description": "Test description",
+
+ "share-files": true
+ },
+
+ "files": {
+ "blank": "blank.png"
+ }
+}
diff --git a/test/instance_static/emoji/test_pack_for_import/blank.png b/test/instance_static/emoji/test_pack_for_import/blank.png
new file mode 100644
index 000000000..8f50fa023
--- /dev/null
+++ b/test/instance_static/emoji/test_pack_for_import/blank.png
Binary files differ
diff --git a/test/instance_static/emoji/test_pack_nonshared/nonshared.zip b/test/instance_static/emoji/test_pack_nonshared/nonshared.zip
new file mode 100644
index 000000000..148446c64
--- /dev/null
+++ b/test/instance_static/emoji/test_pack_nonshared/nonshared.zip
Binary files differ
diff --git a/test/instance_static/emoji/test_pack_nonshared/pack.json b/test/instance_static/emoji/test_pack_nonshared/pack.json
new file mode 100644
index 000000000..b96781f81
--- /dev/null
+++ b/test/instance_static/emoji/test_pack_nonshared/pack.json
@@ -0,0 +1,16 @@
+{
+ "pack": {
+ "license": "Test license",
+ "homepage": "https://pleroma.social",
+ "description": "Test description",
+
+ "fallback-src": "https://nonshared-pack",
+ "fallback-src-sha256": "74409E2674DAA06C072729C6C8426C4CB3B7E0B85ED77792DB7A436E11D76DAF",
+
+ "share-files": false
+ },
+
+ "files": {
+ "blank": "blank.png"
+ }
+}