From b3b7ab5d9a0528bdfa385bd61d7f97ae4c7de374 Mon Sep 17 00:00:00 2001 From: lain Date: Mon, 2 Apr 2018 16:27:36 +0200 Subject: Load all users at once in timelines. --- test/web/activity_pub/activity_pub_test.exs | 2 +- test/web/twitter_api/views/activity_view_test.exs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index c6434f789..657d75a55 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -56,7 +56,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do "id" => "some_id", "object" => %{ "id" => "object_id" - } + } } {:ok, %Activity{} = activity} = ActivityPub.insert(data) diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index 46ffdef44..7f2017d3c 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -64,7 +64,12 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do { TwitterAPI, [], - [context_to_conversation_id: fn(_) -> false end] + [context_to_conversation_id: fn _ -> false end] + }, + { + User, + [:passthrough], + [get_cached_by_ap_id: fn _ -> nil end] } ] @@ -73,7 +78,9 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do assert result["statusnet_conversation_id"] == convo_id assert result["user"] - refute called TwitterAPI.context_to_conversation_id(:_) + refute called(TwitterAPI.context_to_conversation_id(:_)) + refute called(User.get_cached_by_ap_id(user.ap_id)) + refute called(User.get_cached_by_ap_id(other_user.ap_id)) end end -- cgit v1.2.3