diff options
| author | Robert Newson <rnewson@apache.org> | 2020-09-07 15:03:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 15:03:49 +0100 |
| commit | fe7d5215297c1eca389c5580717e11476c3d5a4e (patch) | |
| tree | 5c9db61cfe18662b40278406b151c544017a1965 | |
| parent | f677f1eeb02a8ccfd6f637d53c00993112aced30 (diff) | |
| parent | b82a5757119083177e0c8af9919a5ff4265ddc20 (diff) | |
| download | couchdb-fe7d5215297c1eca389c5580717e11476c3d5a4e.tar.gz | |
Merge pull request #3133 from bessbd/backport-fdb-fix-copy-doc
Make COPY doc return only one "ok"
| -rw-r--r-- | src/chttpd/src/chttpd_db.erl | 2 | ||||
| -rw-r--r-- | src/chttpd/test/eunit/chttpd_db_test.erl | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index c458cba12..ec4a1a40f 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -1271,7 +1271,7 @@ db_doc_req(#httpd{method='COPY'}=Req, Db, SourceDocId) -> send_json(Req, HttpCode, [{"Location", Loc}, {"ETag", "\"" ++ ?b2l(couch_doc:rev_to_str(NewTargetRev)) ++ "\""}], - {[{ok, true}] ++ PartRes}); + {PartRes}); db_doc_req(Req, _Db, _DocId) -> send_method_not_allowed(Req, "DELETE,GET,HEAD,POST,PUT,COPY"). diff --git a/src/chttpd/test/eunit/chttpd_db_test.erl b/src/chttpd/test/eunit/chttpd_db_test.erl index b1d514a4f..cebc3b6d6 100644 --- a/src/chttpd/test/eunit/chttpd_db_test.erl +++ b/src/chttpd/test/eunit/chttpd_db_test.erl @@ -74,6 +74,7 @@ all_test_() -> fun should_not_return_update_seq_when_unset_on_all_docs/1, fun should_return_correct_id_on_doc_copy/1, fun should_ignore_engine_parameter/1, + fun should_return_only_one_ok_on_doc_copy/1, fun should_succeed_on_all_docs_with_queries_keys/1, fun should_succeed_on_all_docs_with_queries_limit_skip/1, fun should_succeed_on_all_docs_with_multiple_queries/1, @@ -268,6 +269,17 @@ should_return_correct_id_on_doc_copy(Url) -> ] end)}. +should_return_only_one_ok_on_doc_copy(Url) -> + {timeout, ?TIMEOUT, ?_test(begin + {ok, _, _, _} = create_doc(Url, "testdoc"), + {_, _, _, ResultBody} = test_request:copy(Url ++ "/testdoc", + [?CONTENT_JSON, ?AUTH, ?DESTHEADER1]), + {ResultJson} = jiffy:decode(ResultBody), + NumOks = length(lists:filter(fun({Key, Value}) -> Key == <<"ok">> end, ResultJson)), + [ + ?assertEqual(1, NumOks) + ] + end)}. attachment_doc() -> {ok, Data} = file:read_file(?FIXTURE_TXT), |