diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-06 13:26:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-06 13:26:05 +0300 |
| commit | ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e (patch) | |
| tree | 7a9d31d44f362ff903813925171a4c31942b8261 /test/web/mastodon_api/mastodon_api_test.exs | |
| parent | 79cf629e1a3610a93f5b9349c18a4464eb859d3d (diff) | |
| parent | 896ffabe37406e85c2a3c2f30d2e882c68b5831e (diff) | |
| download | pleroma-ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e.tar.gz pleroma-ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e.zip | |
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_test.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/web/mastodon_api/mastodon_api_test.exs b/test/web/mastodon_api/mastodon_api_test.exs index b4c0427c9..7fcb2bd55 100644 --- a/test/web/mastodon_api/mastodon_api_test.exs +++ b/test/web/mastodon_api/mastodon_api_test.exs @@ -8,8 +8,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do alias Pleroma.Notification alias Pleroma.ScheduledActivity alias Pleroma.User + alias Pleroma.Web.CommonAPI alias Pleroma.Web.MastodonAPI.MastodonAPI - alias Pleroma.Web.TwitterAPI.TwitterAPI import Pleroma.Factory @@ -75,8 +75,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do User.subscribe(subscriber, user) - {:ok, status} = TwitterAPI.create_status(user, %{"status" => "Akariiiin"}) - {:ok, status1} = TwitterAPI.create_status(user, %{"status" => "Magi"}) + {:ok, status} = CommonAPI.post(user, %{"status" => "Akariiiin"}) + + {:ok, status1} = CommonAPI.post(user, %{"status" => "Magi"}) {:ok, [notification]} = Notification.create_notifications(status) {:ok, [notification1]} = Notification.create_notifications(status1) res = MastodonAPI.get_notifications(subscriber) |