diff options
| author | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
| commit | dffde6631d105949b62c1ff27c22fefcb873b2e8 (patch) | |
| tree | f486f66ae4067ec1bc0dec7f265765b6d35a9c58 /test/web/twitter_api/twitter_api_test.exs | |
| parent | 1e185b9301ec85cd2aaeb1faf075aaa86f733373 (diff) | |
| parent | 0f722a8c223c1953c9c9fb45e73cc9ace92839e2 (diff) | |
| download | pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.tar.gz pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.zip | |
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
Diffstat (limited to 'test/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
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 |