diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
| commit | a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782 (patch) | |
| tree | 6020b41080baf529496a5faf36e1523279a76511 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | 25ab90edeaae53b6ce084d1ba9a02df5505b5041 (diff) | |
| parent | 79e503b3f5ea87c53d4c616ca9ddfa049877705c (diff) | |
| download | pleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.tar.gz pleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.zip | |
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 1a60ad8e6..26c9c25a6 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -6,8 +6,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do use Pleroma.Web.ConnCase alias Pleroma.Web.TwitterAPI.TwitterAPI - alias Pleroma.{Repo, User, Object, Activity, Notification} - alias Pleroma.Web.{OStatus, CommonAPI} + alias Pleroma.Repo + alias Pleroma.User + alias Pleroma.Object + alias Pleroma.Activity + alias Pleroma.Notification + alias Pleroma.Web.OStatus + alias Pleroma.Web.CommonAPI alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.MastodonAPI.FilterView alias Ecto.Changeset @@ -31,7 +36,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do |> assign(:user, user) |> get("/api/v1/timelines/home") - assert length(json_response(conn, 200)) == 0 + assert Enum.empty?(json_response(conn, 200)) {:ok, user} = User.follow(user, following) |