summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-03 00:32:34 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-03 00:32:34 +0400
commit0f386110c6e15148ff1ff5ea3451885485fcb7ff (patch)
tree8a4dcbede6c674730980e1fafa5b956518170a14 /test/fixtures
parent011ede45361096f55dda938078e24574cdf33b2b (diff)
parent4c02e049358441529c54a72cd11f1c81ee897d49 (diff)
downloadpleroma-0f386110c6e15148ff1ff5ea3451885485fcb7ff.tar.gz
pleroma-0f386110c6e15148ff1ff5ea3451885485fcb7ff.zip
Merge remote-tracking branch 'origin/develop' into global-status-expiration
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/mastodon-post-activity.json13
-rw-r--r--test/fixtures/modules/runtime_module.ex2
2 files changed, 14 insertions, 1 deletions
diff --git a/test/fixtures/mastodon-post-activity.json b/test/fixtures/mastodon-post-activity.json
index b91263431..5c3d22722 100644
--- a/test/fixtures/mastodon-post-activity.json
+++ b/test/fixtures/mastodon-post-activity.json
@@ -35,6 +35,19 @@
"inReplyTo": null,
"inReplyToAtomUri": null,
"published": "2018-02-12T14:08:20Z",
+ "replies": {
+ "id": "http://mastodon.example.org/users/admin/statuses/99512778738411822/replies",
+ "type": "Collection",
+ "first": {
+ "type": "CollectionPage",
+ "next": "http://mastodon.example.org/users/admin/statuses/99512778738411822/replies?min_id=99512778738411824&page=true",
+ "partOf": "http://mastodon.example.org/users/admin/statuses/99512778738411822/replies",
+ "items": [
+ "http://mastodon.example.org/users/admin/statuses/99512778738411823",
+ "http://mastodon.example.org/users/admin/statuses/99512778738411824"
+ ]
+ }
+ },
"sensitive": true,
"summary": "cw",
"tag": [
diff --git a/test/fixtures/modules/runtime_module.ex b/test/fixtures/modules/runtime_module.ex
index 4711c3532..f11032b57 100644
--- a/test/fixtures/modules/runtime_module.ex
+++ b/test/fixtures/modules/runtime_module.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule RuntimeModule do