diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-06 08:43:38 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-06 08:43:38 +0000 |
| commit | 896ffabe37406e85c2a3c2f30d2e882c68b5831e (patch) | |
| tree | 4205d3cd8038ec25e31a427684a635baedc30a47 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | d0e0f2380d726aebb930c0838e94bc876c3c7460 (diff) | |
| parent | 70eed0594ce4fe2ec668c5ee3ad42c941b29888e (diff) | |
| download | pleroma-896ffabe37406e85c2a3c2f30d2e882c68b5831e.tar.gz pleroma-896ffabe37406e85c2a3c2f30d2e882c68b5831e.zip | |
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 427ee6f63..e18f8f0d1 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -21,7 +21,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do alias Pleroma.Web.OAuth.Token alias Pleroma.Web.OStatus alias Pleroma.Web.Push - alias Pleroma.Web.TwitterAPI.TwitterAPI import Pleroma.Factory import ExUnit.CaptureLog import Tesla.Mock @@ -1484,12 +1483,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do filename: "an_image.jpg" } - media = - TwitterAPI.upload(file, user, "json") - |> Jason.decode!() + {:ok, %{id: media_id}} = ActivityPub.upload(file, actor: user.ap_id) - {:ok, image_post} = - CommonAPI.post(user, %{"status" => "cofe", "media_ids" => [media["media_id"]]}) + {:ok, image_post} = CommonAPI.post(user, %{"status" => "cofe", "media_ids" => [media_id]}) conn = conn |