diff options
author | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
commit | c1d51944c71ff90650b1a631241daf0d8be5b861 (patch) | |
tree | 2e78efaeb892c4b09cac0439f268d6a60637b4dc /test/support | |
parent | 199ad47c22e5d72741f5809eb015bac9b00cca03 (diff) | |
parent | 5722b0e2e5e7113f0422798a6ea8cc40d1953291 (diff) | |
download | pleroma-c1d51944c71ff90650b1a631241daf0d8be5b861.tar.gz pleroma-c1d51944c71ff90650b1a631241daf0d8be5b861.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/conn_case.ex | 9 | ||||
-rw-r--r-- | test/support/http_request_mock.ex | 8 |
2 files changed, 16 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} -> diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 19a202654..eeeba7880 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -82,6 +82,14 @@ defmodule HttpRequestMock do }} end + def get("https://patch.cx/objects/tesla_mock/poll_attachment", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/tesla_mock/poll_attachment.json") + }} + end + def get( "https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/emelie", _, |