Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ ifneq ($(_WITH_CLOUSEAU), )
"$(_WITH_CLOUSEAU)" \
"$(TEST_OPTS)" \
--locald-config test/config/test-config.ini \
--no-eval 'mix test --trace --include test/elixir/test/config/search.elixir'
--no-eval 'mix test --trace --include test/elixir/test/config/search.elixir $(EXUNIT_OPTS)'
else
@echo "Warning: Clouseau is not enabled, \`elixir-search\` cannot be run."
endif
Expand Down
269 changes: 0 additions & 269 deletions src/mango/test/14-json-pagination-test.py

This file was deleted.

4 changes: 2 additions & 2 deletions test/elixir/lib/couch.ex
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ defmodule Couch do

def process_request_body(body) do
if is_map(body) do
:jiffy.encode(body)
:jiffy.encode(body, [:use_nil])
else
body
end
Expand All @@ -131,7 +131,7 @@ defmodule Couch do
content_type = headers[:"Content-Type"]

if !!content_type and String.match?(content_type, ~r/application\/json/) do
body |> IO.iodata_to_binary() |> :jiffy.decode([:return_maps])
body |> IO.iodata_to_binary() |> :jiffy.decode([:return_maps, :use_nil])
else
process_response_body(body)
end
Expand Down
8 changes: 4 additions & 4 deletions test/elixir/lib/couch/dbtest.ex
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ defmodule Couch.DBTest do
if prev_value != "" do
url = "/_node/#{node}/_config/#{section}/#{key}"
headers = ["X-Couch-Persist": "false"]
body = :jiffy.encode(prev_value)
body = :jiffy.encode(prev_value, [:use_nil])
resp = Couch.put(url, headers: headers, body: body)
assert resp.status_code == 200
else
Expand All @@ -109,7 +109,7 @@ defmodule Couch.DBTest do
Enum.map(resp.body["all_nodes"], fn node ->
url = "/_node/#{node}/_config/#{section}/#{key}"
headers = ["X-Couch-Persist": "false"]
body = :jiffy.encode(value)
body = :jiffy.encode(value, [:use_nil])
resp = Couch.put(url, headers: headers, body: body)
assert resp.status_code == 200
{node, resp.body}
Expand Down Expand Up @@ -494,7 +494,7 @@ defmodule Couch.DBTest do
Couch.put(
"/_node/#{node}/_config/#{setting.section}/#{setting.key}",
headers: ["X-Couch-Persist": false],
body: :jiffy.encode(setting.value)
body: :jiffy.encode(setting.value, [:use_nil])
)

assert resp.status_code == 200
Expand Down Expand Up @@ -525,7 +525,7 @@ defmodule Couch.DBTest do
Couch.put(
"/_node/#{node}/_config/#{setting.section}/#{setting.key}",
headers: ["X-Couch-Persist": false],
body: :jiffy.encode(value)
body: :jiffy.encode(value, [:use_nil])
)

assert resp.status_code == 200
Expand Down
2 changes: 1 addition & 1 deletion test/elixir/lib/couch_raw.ex
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ defmodule Rawresp do

def process_request_body(body) do
if is_map(body) do
:jiffy.encode(body)
:jiffy.encode(body, [:use_nil])
else
body
end
Expand Down
2 changes: 1 addition & 1 deletion test/elixir/test/all_docs_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ defmodule AllDocsTest do
assert row["key"] == "1"
assert row["id"] == "1"
assert row["value"]["deleted"]
assert row["doc"] == :null
assert row["doc"] == nil

# Add conflicts
conflicted_doc1 = %{
Expand Down
Loading