diff options
| author | lain <lain@soykaf.club> | 2018-05-26 15:15:52 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-26 15:15:52 +0200 |
| commit | 745072b2cc0ce3be6e1896bcacffb5e48782f6da (patch) | |
| tree | 2d46ec202c6c0bb4e1469da1cd7d369559b8be52 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | e1fe46e1cfccb7971032ecfa04426413f0c00ac6 (diff) | |
| parent | 0a6c897c9488b26273a5fbb2de1ae1bfa0c96675 (diff) | |
| download | pleroma-745072b2cc0ce3be6e1896bcacffb5e48782f6da.tar.gz pleroma-745072b2cc0ce3be6e1896bcacffb5e48782f6da.zip | |
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 2 |
1 files changed, 1 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 0f091b986..936d27182 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -298,7 +298,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do test "list timeline", %{conn: conn} do user = insert(:user) other_user = insert(:user) - {:ok, activity_one} = TwitterAPI.create_status(user, %{"status" => "Marisa is cute."}) + {:ok, _activity_one} = TwitterAPI.create_status(user, %{"status" => "Marisa is cute."}) {:ok, activity_two} = TwitterAPI.create_status(other_user, %{"status" => "Marisa is cute."}) {:ok, list} = Pleroma.List.create("name", user) {:ok, list} = Pleroma.List.follow(list, other_user) |