Rename fake param to preview and make the tests check that the object was not inserted to the db

This commit is contained in:
rinpatch 2019-04-02 14:31:18 +03:00
parent fe5145eeaa
commit fdb4357e9b
3 changed files with 15 additions and 8 deletions

View File

@ -49,4 +49,4 @@ Has these additional fields under the `pleroma` object:
Additional parameters can be added to the JSON body: Additional parameters can be added to the JSON body:
- `fake`: boolean, if set to `true` the post won't be actually posted, but the status entitiy would still be rendered back. This could be useful for previewing rich text/custom emoji, for example. - `preview`: boolean, if set to `true` the post won't be actually posted, but the status entitiy would still be rendered back. This could be useful for previewing rich text/custom emoji, for example.

View File

@ -180,7 +180,7 @@ defmodule Pleroma.Web.CommonAPI do
object: object, object: object,
additional: %{"cc" => cc, "directMessage" => visibility == "direct"} additional: %{"cc" => cc, "directMessage" => visibility == "direct"}
}, },
data["fake"] || false data["preview"] || false
) )
res res

View File

@ -154,34 +154,41 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
"\"Tenshi Eating a Corndog\" is a much discussed concept on /jp/. The significance of it is disputed, so I will focus on one core concept: the symbolism behind it" "\"Tenshi Eating a Corndog\" is a much discussed concept on /jp/. The significance of it is disputed, so I will focus on one core concept: the symbolism behind it"
}) })
real_status = json_response(real_conn, 200)
assert real_status
assert Object.get_by_ap_id(real_status["uri"])
real_status = real_status =
json_response(real_conn, 200) real_status
|> Map.put("id", nil) |> Map.put("id", nil)
|> Map.put("url", nil) |> Map.put("url", nil)
|> Map.put("uri", nil) |> Map.put("uri", nil)
|> Map.put("created_at", nil) |> Map.put("created_at", nil)
|> Kernel.put_in(["pleroma", "conversation_id"], nil) |> Kernel.put_in(["pleroma", "conversation_id"], nil)
assert real_status
fake_conn = fake_conn =
conn conn
|> assign(:user, user) |> assign(:user, user)
|> post("/api/v1/statuses", %{ |> post("/api/v1/statuses", %{
"status" => "status" =>
"\"Tenshi Eating a Corndog\" is a much discussed concept on /jp/. The significance of it is disputed, so I will focus on one core concept: the symbolism behind it", "\"Tenshi Eating a Corndog\" is a much discussed concept on /jp/. The significance of it is disputed, so I will focus on one core concept: the symbolism behind it",
"fake" => true "preview" => true
}) })
fake_status = json_response(fake_conn, 200)
assert fake_status
refute Object.get_by_ap_id(fake_status["uri"])
fake_status = fake_status =
json_response(fake_conn, 200) fake_status
|> Map.put("id", nil) |> Map.put("id", nil)
|> Map.put("url", nil) |> Map.put("url", nil)
|> Map.put("uri", nil) |> Map.put("uri", nil)
|> Map.put("created_at", nil) |> Map.put("created_at", nil)
|> Kernel.put_in(["pleroma", "conversation_id"], nil) |> Kernel.put_in(["pleroma", "conversation_id"], nil)
assert fake_status
assert real_status == fake_status assert real_status == fake_status
end end