diff options
author | Robert Newson <rnewson@apache.org> | 2015-11-27 17:26:44 +0000 |
---|---|---|
committer | Robert Newson <rnewson@apache.org> | 2015-11-27 17:31:13 +0000 |
commit | 0a9f6d7eb909099e11762d0e7668d3e24d7fd890 (patch) | |
tree | 9e9287d85e859d2c03c30c44496b1979a138ad4e | |
parent | fffff0fc521afe291a301d91f97b3b0591bb7978 (diff) | |
download | couchdb-0a9f6d7eb909099e11762d0e7668d3e24d7fd890.tar.gz |
update couch for COUCHDB-2905
-rw-r--r-- | rebar.config.script | 2 | ||||
-rw-r--r-- | test/javascript/tests/content_negotiation.js | 39 |
2 files changed, 1 insertions, 40 deletions
diff --git a/rebar.config.script b/rebar.config.script index 15f652d87..0e23305b0 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -31,7 +31,7 @@ DepDescs = [ {couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"}, {config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"}, {chttpd, "chttpd", "19f92604a31f61235d5d3c9f3383680a75fb7305"}, -{couch, "couch", "c38ab6b2d3489890e574cd8ff01d1f405c4160c6"}, +{couch, "couch", "3a519b2d19b81be414bbc1d9ea410ea0ec9f903f"}, {couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"}, {couch_mrview, "couch-mrview", "c3bed460ee844175b8ce11081386be27f686d8ff"}, {couch_replicator, "couch-replicator", "3ce785710e28222064bfcfd68d7fd0af96b72add"}, diff --git a/test/javascript/tests/content_negotiation.js b/test/javascript/tests/content_negotiation.js deleted file mode 100644 index 36e7dfbd3..000000000 --- a/test/javascript/tests/content_negotiation.js +++ /dev/null @@ -1,39 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - -couchTests.content_negotiation = function(debug) { - var db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"false"}); - db.deleteDb(); - db.createDb(); - if (debug) debugger; - var xhr; - - // with no accept header - var req = CouchDB.newXhr(); - req.open("GET", CouchDB.proxyUrl("/test_suite_db/"), false); - req.send(""); - TEquals("text/plain; charset=utf-8", req.getResponseHeader("Content-Type")); - - // make sure JSON responses end in a newline - var text = req.responseText; - TEquals("\n", text[text.length-1]); - - xhr = CouchDB.request("GET", "/test_suite_db/", { - headers: {"Accept": "text/html; text/plain;*/*"} - }); - TEquals("text/plain; charset=utf-8", xhr.getResponseHeader("Content-Type")); - - xhr = CouchDB.request("GET", "/test_suite_db/", { - headers: {"Accept": "application/json"} - }); - TEquals("application/json", xhr.getResponseHeader("Content-Type")); -}; |