summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Doane <jay.s.doane@gmail.com>2018-11-12 17:59:49 -0800
committerJoan Touzet <wohali@users.noreply.github.com>2018-11-12 20:59:49 -0500
commit8d3b78c27394b183ff8352b2acb8d4af30f7753e (patch)
treeff100e8aad0618e1b596e12b64717edc32b9de99
parente4b3b09f33972a8e31fd379ce3a70d96e849b34b (diff)
downloadcouchdb-8d3b78c27394b183ff8352b2acb8d4af30f7753e.tar.gz
Support elixir 1.7 (#1726)
* Reformat mix.lock * Suppress elixir 1.7 warnings
-rw-r--r--test/elixir/mix.lock7
-rw-r--r--test/elixir/test/replication_test.exs8
-rw-r--r--test/elixir/test/test_helper.exs4
3 files changed, 10 insertions, 9 deletions
diff --git a/test/elixir/mix.lock b/test/elixir/mix.lock
index 2bd015100..4a2e760ed 100644
--- a/test/elixir/mix.lock
+++ b/test/elixir/mix.lock
@@ -1,4 +1,5 @@
-%{"httpotion": {:hex, :httpotion, "3.0.3", "17096ea1a7c0b2df74509e9c15a82b670d66fc4d66e6ef584189f63a9759428d", [], [{:ibrowse, "~> 4.4", [hex: :ibrowse, repo: "hexpm", optional: false]}], "hexpm"},
- "ibrowse": {:hex, :ibrowse, "4.4.0", "2d923325efe0d2cb09b9c6a047b2835a5eda69d8a47ed6ff8bc03628b764e991", [], [], "hexpm"},
- "jiffy": {:hex, :jiffy, "0.14.11", "919a87d491c5a6b5e3bbc27fafedc3a0761ca0b4c405394f121f582fd4e3f0e5", [], [], "hexpm"},
+%{
+ "httpotion": {:hex, :httpotion, "3.0.3", "17096ea1a7c0b2df74509e9c15a82b670d66fc4d66e6ef584189f63a9759428d", [:mix], [{:ibrowse, "~> 4.4", [hex: :ibrowse, repo: "hexpm", optional: false]}], "hexpm"},
+ "ibrowse": {:hex, :ibrowse, "4.4.0", "2d923325efe0d2cb09b9c6a047b2835a5eda69d8a47ed6ff8bc03628b764e991", [:rebar3], [], "hexpm"},
+ "jiffy": {:hex, :jiffy, "0.14.11", "919a87d491c5a6b5e3bbc27fafedc3a0761ca0b4c405394f121f582fd4e3f0e5", [:rebar3], [], "hexpm"},
}
diff --git a/test/elixir/test/replication_test.exs b/test/elixir/test/replication_test.exs
index 0c8d8e060..8c376d7d9 100644
--- a/test/elixir/test/replication_test.exs
+++ b/test/elixir/test/replication_test.exs
@@ -132,7 +132,7 @@ defmodule ReplicationTest do
assert task["replication_id"] == repl_id
repl_body = %{
"replication_id" => repl_id,
- "cancel": true
+ cancel: true
}
result = Couch.post("/_replicate", body: repl_body)
assert result.status_code == 200
@@ -175,7 +175,7 @@ defmodule ReplicationTest do
repl_body = %{
"replication_id" => repl_id,
- "cancel": true
+ cancel: true
}
resp = Couch.Session.post(sess, "/_replicate", body: repl_body)
assert resp.status_code == 401
@@ -1349,7 +1349,7 @@ defmodule ReplicationTest do
assert resp["ok"]
assert resp["_local_id"] == repl_id
- doc = %{"_id" => "foobar", "value": 666}
+ doc = %{"_id" => "foobar", "value" => 666}
[doc] = save_docs(src_db_name, [doc])
wait_for_repl_stop(repl_id, 30000)
@@ -1395,7 +1395,7 @@ defmodule ReplicationTest do
assert history["doc_write_failures"] == 0
token = Enum.random(1..1_000_000)
- query = %{"att_encoding_info": "true", "bypass_cache": token}
+ query = %{att_encoding_info: true, bypass_cache: token}
resp = Couch.get("/#{tgt_db_name}/#{doc["_id"]}", query: query)
assert resp.status_code < 300
assert is_map(resp.body["_attachments"])
diff --git a/test/elixir/test/test_helper.exs b/test/elixir/test/test_helper.exs
index 7e685c837..d0d9d923b 100644
--- a/test/elixir/test/test_helper.exs
+++ b/test/elixir/test/test_helper.exs
@@ -175,8 +175,8 @@ defmodule CouchTestCase do
def sample_doc_foo do
%{
- "_id": "foo",
- "bar": "baz"
+ _id: "foo",
+ bar: "baz"
}
end