From: lain <lain@soykaf.club>
Date: Wed, 13 May 2020 10:44:16 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3cff4e24cd8c56af47b1983ea97ec4643dbc183e;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
---

3cff4e24cd8c56af47b1983ea97ec4643dbc183e
diff --cc test/web/mastodon_api/controllers/timeline_controller_test.exs
index a5c227991,f8b9289f3..237d7daa5
--- a/test/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs
@@@ -47,16 -47,13 +47,16 @@@ defmodule Pleroma.Web.MastodonAPI.Timel
        following = insert(:user, nickname: "followed")
        third_user = insert(:user, nickname: "repeated")
  
-       {:ok, _activity} = CommonAPI.post(following, %{"status" => "post"})
-       {:ok, activity} = CommonAPI.post(third_user, %{"status" => "repeated post"})
+       {:ok, _activity} = CommonAPI.post(following, %{status: "post"})
+       {:ok, activity} = CommonAPI.post(third_user, %{status: "repeated post"})
        {:ok, _, _} = CommonAPI.repeat(activity.id, following)
  
 +      # This one should not show up in the TL
 +      {:ok, _activity} = CommonAPI.post_chat_message(third_user, user, ":gun:")
 +
        ret_conn = get(conn, uri)
  
-       assert Enum.empty?(json_response(ret_conn, :ok))
+       assert Enum.empty?(json_response_and_validate_schema(ret_conn, :ok))
  
        {:ok, _user} = User.follow(user, following)