merge trunk. COUCHDB-1094

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1083325 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 33 deletions

diff --git a/share/www/script/test/rewrite.js b/share/www/script/test/rewrite.js
index 474abb5e..86905f8f 100644
--- a/share/www/script/test/rewrite.js
+++ b/share/www/script/test/rewrite.js
@@ -91,27 +91,6 @@ couchTests.rewrite = function(debug) {
              }
             },
             {
-             "from": "/type/<type>.json",
-             "to": "_show/type/:type",
-             "query": {
-                 "format": "json"
-             }
-            },
-            {
-             "from": "/type/<type>.xml",
-             "to": "_show/type/:type",
-             "query": {
-                 "format": "xml"
-             }
-            },
-            {
-             "from": "/type/<type>",
-             "to": "_show/type/:type",
-             "query": {
-                 "format": "html"
-             }
-            },
-            {
              "from": "/welcome5/*",
              "to" : "_show/*",
              "query": {
@@ -214,9 +193,6 @@ couchTests.rewrite = function(debug) {
             }),
             "welcome3": stringFun(function(doc,req) {
               return "Welcome " + req.query["name"];
-            }),
-            "type": stringFun(function(doc, req) {
-                return req.id + " as " + req.query.format;
             })
           },
           updates: {
@@ -404,15 +380,6 @@ couchTests.rewrite = function(debug) {
         xhr = CouchDB.request("GET", "/test_suite_db/_design/test/_rewrite/simpleForm/complexView6?a=test&b=essai");
         T(xhr.status == 200, "with query params");
         T(/Value: doc 4/.test(xhr.responseText));
-
-        req = CouchDB.request("GET", "/test_suite_db/_design/test/_rewrite/type/test.json");
-        T(req.responseText == "test as json");
-
-        req = CouchDB.request("GET", "/test_suite_db/_design/test/_rewrite/type/test.xml");
-        T(req.responseText == "test as xml");
-
-         req = CouchDB.request("GET", "/test_suite_db/_design/test/_rewrite/type/test");
-        T(req.responseText == "test as html");
         
         // test path relative to server
         designDoc.rewrites.push({