summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-05 12:18:59 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-05 12:18:59 +0300
commite21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (patch)
treefd8ca0c111cff6ef663b4272d64d64333a451032 /test/fixtures
parent88f7cf51d43181b27db5ff1807d3e706fa336bac (diff)
parent228bf4d214abe3bb62c52128d3bc145e396b174d (diff)
downloadpleroma-e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7.tar.gz
pleroma-e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7.zip
Merge branch 'develop' into issue/1411
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/tesla_mock/admin@mastdon.example.org.json9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/fixtures/tesla_mock/admin@mastdon.example.org.json b/test/fixtures/tesla_mock/admin@mastdon.example.org.json
index 8159dc20a..9fdd6557c 100644
--- a/test/fixtures/tesla_mock/admin@mastdon.example.org.json
+++ b/test/fixtures/tesla_mock/admin@mastdon.example.org.json
@@ -9,7 +9,11 @@
"inReplyToAtomUri": "ostatus:inReplyToAtomUri",
"conversation": "ostatus:conversation",
"toot": "http://joinmastodon.org/ns#",
- "Emoji": "toot:Emoji"
+ "Emoji": "toot:Emoji",
+ "alsoKnownAs": {
+ "@id": "as:alsoKnownAs",
+ "@type": "@id"
+ }
}],
"id": "http://mastodon.example.org/users/admin",
"type": "Person",
@@ -50,5 +54,6 @@
"type": "Image",
"mediaType": "image/png",
"url": "https://cdn.niu.moe/accounts/headers/000/033/323/original/850b3448fa5fd477.png"
- }
+ },
+ "alsoKnownAs": ["http://example.org/users/foo"]
}