diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:49:04 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:49:04 +0000 |
| commit | 84808e1697c3b557e4a01104389e78c63cb53528 (patch) | |
| tree | 7f06092a81cabcceb6c02cf5698c1ca4bd6d8754 /test/web/mastodon_api | |
| parent | 409bcad54b5de631536761952faed05ad5fe3b99 (diff) | |
| parent | 708e7f09423eb28c97a8007b9b11bb7b94c9e296 (diff) | |
| download | pleroma-84808e1697c3b557e4a01104389e78c63cb53528.tar.gz pleroma-84808e1697c3b557e4a01104389e78c63cb53528.zip | |
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index e49c4cc22..b023d1e4f 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -2901,8 +2901,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do describe "conversation muting" do setup do + post_user = insert(:user) user = insert(:user) - {:ok, activity} = CommonAPI.post(user, %{"status" => "HIE"}) + + {:ok, activity} = CommonAPI.post(post_user, %{"status" => "HIE"}) [user: user, activity: activity] end |