aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
committerlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
commitda550be066a15108ceef7874c3b2549c049a7f88 (patch)
tree8b9f59c625da682d54c462ee31c125bd4e444814 /test/web/mastodon_api
parent6706cdce65f8b2dda55380dbfdad5e41e600af2d (diff)
parentfbe3d3aa5fe07a89c52a16b7bf0626e323366597 (diff)
downloadpleroma-da550be066a15108ceef7874c3b2549c049a7f88.tar.gz
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests See merge request pleroma/pleroma!2524
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/controllers/search_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs
index 6ad9a59fe..7d0cafccc 100644
--- a/test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/web/mastodon_api/controllers/search_controller_test.exs
@@ -13,7 +13,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
import Tesla.Mock
import Mock
- setup do
+ setup_all do
mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end