summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-12 12:53:04 +0200
committerlain <lain@soykaf.club>2020-08-12 12:53:04 +0200
commitbb92ad44a6e35c0d67a8f349bd55db4bbb6562cf (patch)
treea131779d9ac41ca1feec6d7b0750d90bf17aa1d5 /test/support
parent500576dcb623bdc29193e3b372837c581e151755 (diff)
parent86c18e4165f1b247af11360535a9daa6ce1641d3 (diff)
downloadpleroma-bb92ad44a6e35c0d67a8f349bd55db4bbb6562cf.tar.gz
pleroma-bb92ad44a6e35c0d67a8f349bd55db4bbb6562cf.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
Diffstat (limited to 'test/support')
-rw-r--r--test/support/conn_case.ex9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index b23918dd1..7ef681258 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -56,6 +56,13 @@ defmodule Pleroma.Web.ConnCase do
[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: %{
@@ -79,7 +86,7 @@ defmodule Pleroma.Web.ConnCase do
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} ->