projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/elixir-1.11' into 'develop'
[akkoma]
/
test
/
support
/
conn_case.ex
diff --git
a/test/support/conn_case.ex
b/test/support/conn_case.ex
index fa30a0c41f109f2151e4285d8d26a19267ebe477..9316a82e49a1624eb8fd81b7c3a5ab02b2f55983 100644
(file)
--- a/
test/support/conn_case.ex
+++ b/
test/support/conn_case.ex
@@
-22,7
+22,8
@@
defmodule Pleroma.Web.ConnCase do
using do
quote do
# Import conveniences for testing with connections
using do
quote do
# Import conveniences for testing with connections
- use Phoenix.ConnTest
+ import Plug.Conn
+ import Phoenix.ConnTest
use Pleroma.Tests.Helpers
import Pleroma.Web.Router.Helpers
use Pleroma.Tests.Helpers
import Pleroma.Web.Router.Helpers
@@
-56,6
+57,13
@@
defmodule Pleroma.Web.ConnCase do
[conn: conn]
end
[conn: conn]
end
+ defp empty_json_response(conn) do
+ body = response(conn, 204)
+ response_content_type(conn, :json)
+
+ body
+ end
+
defp json_response_and_validate_schema(
%{
private: %{
defp json_response_and_validate_schema(
%{
private: %{
@@
-74,12
+82,12
@@
defmodule Pleroma.Web.ConnCase do
status = Plug.Conn.Status.code(status)
unless lookup[op_id].responses[status] do
status = Plug.Conn.Status.code(status)
unless lookup[op_id].responses[status] do
- err = "Response schema not found for #{
conn.
status} #{conn.method} #{conn.request_path}"
+ err = "Response schema not found for #{status} #{conn.method} #{conn.request_path}"
flunk(err)
end
schema = lookup[op_id].responses[status].content[content_type].schema
flunk(err)
end
schema = lookup[op_id].responses[status].content[content_type].schema
- json = json_response(conn, status)
+ json =
if status == 204, do: empty_json_response(conn), else:
json_response(conn, status)
case OpenApiSpex.cast_value(json, schema, spec) do
{:ok, _data} ->
case OpenApiSpex.cast_value(json, schema, spec) do
{:ok, _data} ->
@@
-139,7
+147,11
@@
defmodule Pleroma.Web.ConnCase do
end
if tags[:needs_streamer] do
end
if tags[:needs_streamer] do
- start_supervised(Pleroma.Web.Streamer.supervisor())
+ start_supervised(%{
+ id: Pleroma.Web.Streamer.registry(),
+ start:
+ {Registry, :start_link, [[keys: :duplicate, name: Pleroma.Web.Streamer.registry()]]}
+ })
end
{:ok, conn: Phoenix.ConnTest.build_conn()}
end
{:ok, conn: Phoenix.ConnTest.build_conn()}