3 files changed, 71 insertions, 0 deletions
diff --git a/share/Makefile.am b/share/Makefile.am
index d3ba2b1a..22560a68 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -107,6 +107,7 @@ nobase_dist_localdata_DATA = \
     www/script/test/multiple_rows.js \
     www/script/test/large_docs.js \
     www/script/test/utf8.js \
+    www/script/test/jsonp.js \
     www/script/test/attachments.js \
     www/script/test/attachment_paths.js \
     www/script/test/attachment_views.js \
diff --git a/share/www/script/couch_tests.js b/share/www/script/couch_tests.js
index 6528835d..f7c26d01 100644
--- a/share/www/script/couch_tests.js
+++ b/share/www/script/couch_tests.js
@@ -42,6 +42,7 @@ loadTest("design_options.js");
 loadTest("multiple_rows.js");
 loadTest("large_docs.js");
 loadTest("utf8.js");
+loadTest("jsonp.js");
 loadTest("attachments.js");
 loadTest("attachment_names.js");
 loadTest("attachment_paths.js");
diff --git a/share/www/script/test/jsonp.js b/share/www/script/test/jsonp.js
new file mode 100644
index 00000000..5ea31180
--- /dev/null
+++ b/share/www/script/test/jsonp.js
@@ -0,0 +1,69 @@
+// 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.
+
+// Verify callbacks ran
+var jsonp_flag = 0;
+
+// Callbacks
+function jsonp_no_chunk(doc) {
+  T(jsonp_flag == 0);
+  T(doc._id == "0");
+  jsonp_flag = 1;
+}
+
+function jsonp_chunk(doc) {
+  T(jsonp_flag == 0);
+  T(doc.total_rows == 1);
+  jsonp_flag = 1;
+}
+
+// Do some jsonp tests.
+couchTests.jsonp = function(debug) {
+  var db = new CouchDB("test_suite_db");
+  db.deleteDb();
+  db.createDb();
+  if (debug) debugger;
+
+  var doc = {_id:"0",a:0,b:0};
+  T(db.save(doc).ok);
+
+  // Test unchunked callbacks.
+  var xhr = CouchDB.request("GET", "/test_suite_db/0?callback=jsonp_no_chunk");
+  T(xhr.status == 200);
+  jsonp_flag = 0;
+  eval(xhr.responseText);
+  T(jsonp_flag == 1);
+  xhr = CouchDB.request("GET", "/test_suite_db/0?callback=foo\"");
+  T(xhr.status == 400);
+
+  // Test chunked responses
+  var doc = {_id:"1",a:1,b:1};
+  T(db.save(doc).ok);
+
+  var designDoc = {
+    _id:"_design/test",
+    language: "javascript",
+    views: {
+      all_docs: {map: "function(doc) {if(doc.a) emit(null, doc.a);}"}
+    }
+  }
+  T(db.save(designDoc).ok);
+
+  var url = "/test_suite_db/_design/test/_view/all_docs?callback=jsonp_chunk";
+  xhr = CouchDB.request("GET", url);
+  T(xhr.status == 200);
+  jsonp_flag = 0;
+  eval(xhr.responseText);
+  T(jsonp_flag == 1);
+  xhr = CouchDB.request("GET", url + "\'");
+  T(xhr.status == 400);
+};