diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
| commit | 4944498133d4a945650201226808b1f09d355014 (patch) | |
| tree | 02e83bac731ca6b391b63d826d8230bdb0fdaed8 /test/fixtures | |
| parent | bac58b152495c3ebf72e3ad1c3102de075fcc366 (diff) | |
| parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
| download | pleroma-4944498133d4a945650201226808b1f09d355014.tar.gz pleroma-4944498133d4a945650201226808b1f09d355014.zip | |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/httpoison_mock/framatube.org_host_meta | 2 | ||||
| -rw-r--r-- | test/fixtures/httpoison_mock/gerzilla.de_host_meta | 10 | ||||
| -rw-r--r-- | test/fixtures/httpoison_mock/gnusocial.de_host_meta | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/test/fixtures/httpoison_mock/framatube.org_host_meta b/test/fixtures/httpoison_mock/framatube.org_host_meta new file mode 100644 index 000000000..91516ff6d --- /dev/null +++ b/test/fixtures/httpoison_mock/framatube.org_host_meta @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><hm:Host xmlns:hm="http://host-meta.net/xrd/1.0">framatube.org</hm:Host><Link rel="lrdd" template="http://framatube.org/main/xrd?uri={uri}"><Title>Resource Descriptor</Title></Link></XRD> diff --git a/test/fixtures/httpoison_mock/gerzilla.de_host_meta b/test/fixtures/httpoison_mock/gerzilla.de_host_meta new file mode 100644 index 000000000..fae8f37eb --- /dev/null +++ b/test/fixtures/httpoison_mock/gerzilla.de_host_meta @@ -0,0 +1,10 @@ +<?xml version='1.0' encoding='UTF-8'?><XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' + xmlns:hm='http://host-meta.net/xrd/1.0'> + + <hm:Host>gerzilla.de</hm:Host> + + <Link rel='lrdd' type="application/xrd+xml" template='https://gerzilla.de/xrd/?uri={uri}' /> + <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" + href="https://gerzilla.de/oexchange/xrd" /> + +</XRD> diff --git a/test/fixtures/httpoison_mock/gnusocial.de_host_meta b/test/fixtures/httpoison_mock/gnusocial.de_host_meta new file mode 100644 index 000000000..a4affb102 --- /dev/null +++ b/test/fixtures/httpoison_mock/gnusocial.de_host_meta @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><hm:Host xmlns:hm="http://host-meta.net/xrd/1.0">gnusocial.de</hm:Host><Link rel="lrdd" template="http://gnusocial.de/main/xrd?uri={uri}"><Title>Resource Descriptor</Title></Link></XRD> |