diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
| commit | 0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8 (patch) | |
| tree | 45a693814a7f1f7bd2d6108732f2b75086f1fa0a /test/web/twitter_api/representers/object_representer_test.exs | |
| parent | 30261772063a30ca0ef299f441cfed4630ffb630 (diff) | |
| parent | 3448b434f54e8b4749524e3ccd876359a6501845 (diff) | |
| download | pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.tar.gz pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.zip | |
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
Diffstat (limited to 'test/web/twitter_api/representers/object_representer_test.exs')
| -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) |