diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-20 16:42:52 +0000 | 
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-20 16:42:52 +0000 | 
| commit | 77fb926afa53a6d156729b1dd1613e1fed0c7910 (patch) | |
| tree | 664749eba067c19cc89157f188d0d2e4d1f54cb9 /test/web/mastodon_api | |
| parent | dff5e1e46ab5e622ae0cc4b4422ae57ce0a0d5de (diff) | |
| parent | 59c27f29c8315b3de97c35d260a038a3f09c1885 (diff) | |
| download | pleroma-77fb926afa53a6d156729b1dd1613e1fed0c7910.tar.gz pleroma-77fb926afa53a6d156729b1dd1613e1fed0c7910.zip | |
Merge branch 'nicer-share-urls' into 'develop'
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 0dc9c538c..3412a6be2 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -81,7 +81,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do      expected = %{        id: to_string(note.id),        uri: note.data["object"]["id"], -      url: note.data["object"]["id"], +      url: Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, note),        account: AccountView.render("account.json", %{user: user}),        in_reply_to_id: nil,        in_reply_to_account_id: nil, | 
