aboutsummaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-04 17:39:28 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-04 17:39:28 +0000
commitca6f1644aa72e9f3b56e57b8b6dfc0830d44648a (patch)
tree3ee414167996edf5bc39851482c7972673020147 /test/support
parent222c238e7b807853dc02a79e00273b5f6b70eb4b (diff)
parentd9e0108baacbe26a2f594d6f2badec58010ff1f9 (diff)
downloadpleroma-ca6f1644aa72e9f3b56e57b8b6dfc0830d44648a.tar.gz
Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
widen streaming API blocks (for 1.1) See merge request pleroma/pleroma!1785
Diffstat (limited to 'test/support')
-rw-r--r--test/support/conn_case.ex4
-rw-r--r--test/support/data_case.ex4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index ec5892ff5..b39c70677 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -40,6 +40,10 @@ defmodule Pleroma.Web.ConnCase do
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
end
+ if tags[:needs_streamer] do
+ start_supervised(Pleroma.Web.Streamer.supervisor())
+ end
+
{:ok, conn: Phoenix.ConnTest.build_conn()}
end
end
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index f3d98e7e3..17fa15214 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -39,6 +39,10 @@ defmodule Pleroma.DataCase do
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
end
+ if tags[:needs_streamer] do
+ start_supervised(Pleroma.Web.Streamer.supervisor())
+ end
+
:ok
end