diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
| commit | c9b418e5477229017b3750c55cf3ea3d03b7e609 (patch) | |
| tree | d1b458bea76ff3ec296897de405f9e3c8578f897 /test/web/twitter_api/twitter_api_test.exs | |
| parent | 44693fbf6e5c5ec5622207e263688e3af7d1a83a (diff) | |
| parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
| download | pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.tar.gz pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.zip | |
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
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 547592ff2..f94e2b873 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -451,7 +451,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_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status") end end end |