diff options
| author | lain <lain@soykaf.club> | 2019-11-20 12:46:33 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-20 12:46:33 +0000 |
| commit | 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68 (patch) | |
| tree | 0b337c559fc94b90d02976086370b2d8ad221a5b | |
| parent | 75efdb0781bcaf4b685dbba0d218cb158fc3fcaf (diff) | |
| parent | 63711258cebe52c5b0b841a661dc042e8161470c (diff) | |
Merge branch 'fix/sporadic-tests' into 'develop'
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
| -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 |