diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:25:38 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:25:38 +0000 |
| commit | 94d8f1ab305b513931b81d7a4b3e41e30b688a16 (patch) | |
| tree | beed6b2eb88909f74a6747e2131e827def7b584f /test/web/mastodon_api | |
| parent | da4315b5ef643f07376f159df6fd41636e07e01d (diff) | |
| parent | 1cea97df646566bfd6e31d9696047ba87f1e82c1 (diff) | |
| download | pleroma-94d8f1ab305b513931b81d7a4b3e41e30b688a16.tar.gz pleroma-94d8f1ab305b513931b81d7a4b3e41e30b688a16.zip | |
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index a2d3a2547..3cb9b9c5b 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -54,7 +54,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do note: "", privacy: "public", sensitive: false - } + }, + pleroma: %{tags: []} } assert expected == AccountView.render("account.json", %{user: user}) @@ -91,7 +92,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do note: "", privacy: "public", sensitive: false - } + }, + pleroma: %{tags: []} } assert expected == AccountView.render("account.json", %{user: user}) |