summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-01-16 14:18:07 +0000
committerlambda <pleromagit@rogerbraun.net>2018-01-16 14:18:07 +0000
commitac7580df78da4fcace872732d05a3e9850980495 (patch)
tree499bf53955d6a21f92ce2010e3e62f79438cbff6 /test
parent80f6ac412a632da090be9f3d86971eac0b95a53d (diff)
parentb3e7d7ae6d4ab4b871ecf18706461945fd148a1b (diff)
downloadpleroma-ac7580df78da4fcace872732d05a3e9850980495.tar.gz
pleroma-ac7580df78da4fcace872732d05a3e9850980495.zip
Merge branch 'fix/background-profile-fetch' into 'develop'
Fetch external profile in the background. See merge request pleroma/pleroma!49
Diffstat (limited to 'test')
-rw-r--r--test/web/twitter_api/twitter_api_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 823ba3913..ac62880d5 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -404,7 +404,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert represented["id"] == UserView.render("show.json", %{user: remote, for: user})["id"]
# Also fetches the feed.
- assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status")
+ # assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status")
end
end
end