diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:43:11 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:43:11 +0900 |
| commit | fd24467b923bd09850979600aeb9a46f8f0c7967 (patch) | |
| tree | caed7d4448e3d89f796c92eed5c501690d8ee62a /test/web/mastodon_api/controllers | |
| parent | 114930b5fd816657c21c5fbe33845fd3742c9c23 (diff) | |
| parent | 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68 (diff) | |
| download | pleroma-fd24467b923bd09850979600aeb9a46f8f0c7967.tar.gz pleroma-fd24467b923bd09850979600aeb9a46f8f0c7967.zip | |
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Diffstat (limited to 'test/web/mastodon_api/controllers')
| -rw-r--r-- | test/web/mastodon_api/controllers/filter_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/filter_controller_test.exs b/test/web/mastodon_api/controllers/filter_controller_test.exs index 5d5b56c8e..550689788 100644 --- a/test/web/mastodon_api/controllers/filter_controller_test.exs +++ b/test/web/mastodon_api/controllers/filter_controller_test.exs @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do - use Pleroma.Web.ConnCase, async: true + use Pleroma.Web.ConnCase alias Pleroma.Web.MastodonAPI.FilterView diff --git a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs index 9ad6a4fa7..ae5fee2bc 100644 --- a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs +++ b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do - use Pleroma.Web.ConnCase, async: true + use Pleroma.Web.ConnCase alias Pleroma.Repo alias Pleroma.ScheduledActivity |