diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-25 00:20:25 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-25 00:20:25 +0000 |
| commit | ffa552f1a41c530a7eff25d27cf0a82e710067b6 (patch) | |
| tree | 7dc49ded6cd1db9ea4ca91f18b9ef9a9ab2a9cd4 /test | |
| parent | 66bc37925e8896d156bbbb4a89a73cf8d9c88d56 (diff) | |
| parent | aab2bdddf4456c99d5d5042183c1225f7e771f56 (diff) | |
| download | pleroma-ffa552f1a41c530a7eff25d27cf0a82e710067b6.tar.gz pleroma-ffa552f1a41c530a7eff25d27cf0a82e710067b6.zip | |
Merge branch 'feature/twitterapi-object-description' into 'develop'
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/twitter_api/representers/object_representer_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/web/twitter_api/representers/object_representer_test.exs b/test/web/twitter_api/representers/object_representer_test.exs index ebac051dc..228b2ac42 100644 --- a/test/web/twitter_api/representers/object_representer_test.exs +++ b/test/web/twitter_api/representers/object_representer_test.exs @@ -23,7 +23,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do id: 6, url: "someurl", mimetype: "sometype", - oembed: false + oembed: false, + description: nil } assert expected_object == ObjectRepresenter.to_map(object) @@ -46,7 +47,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png", mimetype: "image/png", oembed: false, - id: nil + id: nil, + description: "blabla" } assert expected_object == ObjectRepresenter.to_map(object) |