Skip to content

Commit

Permalink
Use Req.Test.json/2
Browse files Browse the repository at this point in the history
  • Loading branch information
wojtekmach committed Mar 12, 2024
1 parent 906b63e commit 27d4cc8
Showing 1 changed file with 6 additions and 19 deletions.
25 changes: 6 additions & 19 deletions test/req/steps_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ defmodule Req.StepsTest do
@tag :tmp_dir
test "decode_body with output", c do
Bypass.expect(c.bypass, "GET", "/", fn conn ->
json(conn, 200, %{a: 1})
Req.Test.json(conn, %{a: 1})
end)

assert Req.get!(c.url, output: c.tmp_dir <> "/a.json").body == ""
Expand Down Expand Up @@ -633,7 +633,7 @@ defmodule Req.StepsTest do

test "disables decoding", c do
Bypass.expect_once(c.bypass, "GET", "/foo.json", fn conn ->
json(conn, 200, %{a: 1})
Req.Test.json(conn, %{a: 1})
end)

response = Req.get!(c.url <> "/foo.json", output: :remote_name)
Expand Down Expand Up @@ -671,7 +671,7 @@ defmodule Req.StepsTest do

test "json", c do
Bypass.expect(c.bypass, "GET", "/", fn conn ->
json(conn, 200, %{a: 1})
Req.Test.json(conn, %{a: 1})
end)

assert Req.get!(c.url).body == %{"a" => 1}
Expand All @@ -681,15 +681,15 @@ defmodule Req.StepsTest do
Bypass.expect(c.bypass, "GET", "/", fn conn ->
conn
|> Plug.Conn.put_resp_header("content-type", "application/vnd.api+json; charset=utf-8")
|> json(200, %{a: 1})
|> Req.Test.json(%{a: 1})
end)

assert Req.get!(c.url).body == %{"a" => 1}
end

test "json with custom options", c do
Bypass.expect(c.bypass, "GET", "/", fn conn ->
json(conn, 200, %{a: 1})
Req.Test.json(conn, %{a: 1})
end)

assert Req.get!(c.url, decode_json: [keys: :atoms]).body == %{a: 1}
Expand Down Expand Up @@ -1593,7 +1593,7 @@ defmodule Req.StepsTest do

conn
|> Plug.Conn.put_resp_header("last-modified", "Wed, 21 Oct 2015 07:28:00 GMT")
|> json(200, %{a: 1})
|> Req.Test.json(%{a: 1})

_ ->
send(pid, :cache_hit)
Expand Down Expand Up @@ -2125,17 +2125,4 @@ defmodule Req.StepsTest do
assert :ok = Req.cancel_async_response(resp)
end
end

defp json(conn, status, data) do
conn =
case Plug.Conn.get_resp_header(conn, "content-type") do
[] ->
Plug.Conn.put_resp_content_type(conn, "application/json")

_ ->
conn
end

Plug.Conn.send_resp(conn, status, Jason.encode_to_iodata!(data))
end
end

0 comments on commit 27d4cc8

Please sign in to comment.