1 files changed, 115 insertions, 6 deletions

diff --git a/share/www/script/couch_test_runner.js b/share/www/script/couch_test_runner.js
index 237f9312..56787e9a 100644
--- a/share/www/script/couch_test_runner.js
+++ b/share/www/script/couch_test_runner.js
@@ -14,6 +14,13 @@
 
 
 function loadScript(url) {
+  // disallow loading remote URLs
+  if((url.substr(0, 7) == "http://")
+    || (url.substr(0, 2) == "//")
+    || (url.substr(0, 5) == "data:")
+    || (url.substr(0, 11) == "javsacript:")) {
+        throw "Not loading remote test scripts";
+  }
   if (typeof document != "undefined") document.write('<script src="'+url+'"></script>');
 };
 
@@ -21,7 +28,7 @@ function patchTest(fun) {
   var source = fun.toString();
   var output = "";
   var i = 0;
-  var testMarker = "T("
+  var testMarker = "T(";
   while (i < source.length) {
     var testStart = source.indexOf(testMarker, i);
     if (testStart == -1) {
@@ -72,6 +79,7 @@ function runTest(button, callback, debug, noSave) {
   var row = currentRow = $(button).parents("tr").get(0);
   $("td.status", row).removeClass("error").removeClass("failure").removeClass("success");
   $("td", row).text("");
+  $("#toolbar li.current").text("Running: "+row.id);
   var testFun = couchTests[row.id];
   function run() {
     numFailures = 0;
@@ -103,6 +111,7 @@ function runTest(button, callback, debug, noSave) {
     var duration = new Date().getTime() - start;
     $("td.status", row).removeClass("running").addClass(status).text(status);
     $("td.duration", row).text(duration + "ms");
+    $("#toolbar li.current").text("Finished: "+row.id);
     updateTestsFooter();
     currentRow = null;
     if (callback) callback();
@@ -138,7 +147,8 @@ function setupAdminParty(fun) {
       }
     };
     $.couch.session({
-      success : function(userCtx) {
+      success : function(resp) {
+        var userCtx = resp.userCtx;
         if (userCtx.name && userCtx.roles.indexOf("_admin") != -1) {
           // admin but not admin party. dialog offering to make admin party
           $.showDialog("dialog/_admin_party.html", {
@@ -229,13 +239,13 @@ function saveTestReport(report) {
       $.couch.info({success : function(node_info) {
         report.node = node_info;
         db.saveDoc(report);        
-      }})
+      }});
     };
     var createDb = function() {
       db.create({success: function() {
         db.info({success:saveReport});        
       }});    
-    }
+    };
     db.info({error: createDb, success:saveReport});
   }
 };
@@ -299,12 +309,18 @@ function T(arg1, arg2, testName) {
         .find("code").text(message).end()
         .appendTo($("td.details ol", currentRow));
     }
-    numFailures += 1
+    numFailures += 1;
   }
 }
 
 function TEquals(expected, actual, testName) {
-  T(equals(expected, actual), "expected '" + expected + "', got '" + actual + "'", testName);
+  T(equals(expected, actual), "expected '" + repr(expected) +
+    "', got '" + repr(actual) + "'", testName);
+}
+
+function TEqualsIgnoreCase(expected, actual, testName) {
+  T(equals(expected.toUpperCase(), actual.toUpperCase()), "expected '" + repr(expected) +
+    "', got '" + repr(actual) + "'", testName);
 }
 
 function equals(a,b) {
@@ -326,3 +342,96 @@ function repr(val) {
   }
 }
 
+function makeDocs(start, end, templateDoc) {
+  var templateDocSrc = templateDoc ? JSON.stringify(templateDoc) : "{}";
+  if (end === undefined) {
+    end = start;
+    start = 0;
+  }
+  var docs = [];
+  for (var i = start; i < end; i++) {
+    var newDoc = eval("(" + templateDocSrc + ")");
+    newDoc._id = (i).toString();
+    newDoc.integer = i;
+    newDoc.string = (i).toString();
+    docs.push(newDoc);
+  }
+  return docs;
+}
+
+function run_on_modified_server(settings, fun) {
+  try {
+    // set the settings
+    for(var i=0; i < settings.length; i++) {
+      var s = settings[i];
+      var xhr = CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
+        body: JSON.stringify(s.value),
+        headers: {"X-Couch-Persist": "false"}
+      });
+      CouchDB.maybeThrowError(xhr);
+      s.oldValue = xhr.responseText;
+    }
+    // run the thing
+    fun();
+  } finally {
+    // unset the settings
+    for(var j=0; j < i; j++) {
+      var s = settings[j];
+      if(s.oldValue == "\"\"\n") { // unset value
+        CouchDB.request("DELETE", "/_config/" + s.section + "/" + s.key, {
+          headers: {"X-Couch-Persist": "false"}
+        });
+      } else {
+        CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
+          body: s.oldValue,
+          headers: {"X-Couch-Persist": "false"}
+        });
+      }
+    }
+  }
+}
+
+function stringFun(fun) {
+  var string = fun.toSource ? fun.toSource() : "(" + fun.toString() + ")";
+  return string;
+}
+
+function waitForSuccess(fun, tag) {
+  var start = new Date();
+  while(true) {
+    if (new Date() - start > 5000) {
+      throw("timeout: "+tag);
+    } else {
+      try {
+        fun();
+        break;
+      } catch (e) {}
+      // sync http req allow async req to happen
+      CouchDB.request("GET", "/test_suite_db/?tag="+encodeURIComponent(tag));
+    }
+  }
+}
+
+function waitForRestart() {
+  var waiting = true;
+  while (waiting) {
+    try {
+      CouchDB.request("GET", "/");
+      CouchDB.request("GET", "/");
+      waiting = false;
+    } catch(e) {
+      // the request will fail until restart completes
+    }
+  }
+};
+
+function restartServer() {
+  var xhr;
+  try {
+    CouchDB.request("POST", "/_restart");
+  } catch(e) {
+    // this request may sometimes fail
+  }
+  waitForRestart();
+}
+