diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-19 16:55:33 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-19 16:55:33 +0000 |
| commit | 9da8b287f8a2c1fda2ca05351d5418321510472b (patch) | |
| tree | ef85c774a5450fadc30f9ad2e5beaaca11e2bf02 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | cc93775ebf539598075c0b9afb96c60c8bede6b5 (diff) | |
| parent | f9865cf9439e2e9273f55d3b82c1e68166178b07 (diff) | |
| download | pleroma-9da8b287f8a2c1fda2ca05351d5418321510472b.tar.gz pleroma-9da8b287f8a2c1fda2ca05351d5418321510472b.zip | |
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index f21cf677d..786af2088 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1879,7 +1879,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do capture_log(fn -> conn = conn - |> get("/api/v1/search", %{"q" => activity.data["object"]["id"]}) + |> get("/api/v1/search", %{"q" => Object.normalize(activity).data["id"]}) assert results = json_response(conn, 200) @@ -2791,9 +2791,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert %{"content" => "xD", "id" => id} = json_response(conn1, 200) - activity = Activity.get_by_id(id) + activity = Activity.get_by_id_with_object(id) - assert activity.data["object"]["inReplyTo"] == replied_to.data["object"]["id"] + assert Object.normalize(activity).data["inReplyTo"] == Object.normalize(replied_to).data["id"] assert Activity.get_in_reply_to_activity(activity).id == replied_to.id # Reblog from the third user |