commit 79494bb648cd32868dff9049aaa567eda50b2ebe
author Michal Mocny <mmocny@gmail.com> Wed Jan 14 11:43:20 2015 -0500
committer Michal Mocny <mmocny@gmail.com> Wed Jan 14 11:43:20 2015 -0500
tree ea2d248b4d655f7168e3c3ad6e3f44712bcb7a4b
parent a756992d15c6f825320af3de961c2a3b26bf0897
parent 1456ebc984e93ddd7b708aa8f00ebeae32d4eea7

Merge pull request #6 from jpchase/CB-7459-part2

CB-7459 Add header to show number of enabled plugin tests

www/assets/jasmine-medic.js

diff --git a/www/assets/jasmine-medic.js b/www/assets/jasmine-medic.js
index 5673ecb..49b0745 100644
--- a/www/assets/jasmine-medic.js
+++ b/www/assets/jasmine-medic.js
@@ -99,7 +99,8 @@
       this.postTests({
           mobilespec:buildResults(),
           platform:(platformMap.hasOwnProperty(p) ? platformMap[p] : p),
-          version:p,
+          version: device.version.toLowerCase(),
+          sha: options.sha,
           timestamp:Math.round(Math.floor((new Date()).getTime() / 1000)),
           model:devmodel
           });
@@ -124,7 +125,9 @@
       console.log('posting tests');
 
       var xhr = new XMLHttpRequest();
-      xhr.open("POST", serverurl+'/result', true);
+      var doc_id = [options.sha, json.version, json.model].map(encodeURIComponent).join('__');
+      var doc_url = serverurl + '/mobilespec_results/' + doc_id;
+      xhr.open("PUT", doc_url, true);
       xhr.setRequestHeader("Content-Type","application/json")
       xhr.send(JSON.stringify(json));
     }

www/jasmine_helpers.js

diff --git a/www/jasmine_helpers.js b/www/jasmine_helpers.js
index 7d8690c..7e0864d 100644
--- a/www/jasmine_helpers.js
+++ b/www/jasmine_helpers.js
@@ -81,13 +81,16 @@
     jasmineEnv.addReporter(jasmineInterface.htmlReporter);
 
     var medic = require('org.apache.cordova.test-framework.medic');
+
     if (medic.enabled) {
         jasmineRequire.medic(jasmineInterface.jasmine);
         jasmineInterface.MedicReporter = new jasmineInterface.jasmine.MedicReporter({
             env: jasmineEnv,
-            log: { logurl: medic.logurl }
+            log: { logurl: medic.logurl },
+            sha: medic.sha
         });
         jasmineInterface.MedicReporter.initialize();
         jasmineEnv.addReporter(jasmineInterface.MedicReporter);
     }
+    
 }

www/medic.js

diff --git a/www/medic.js b/www/medic.js
index 4c3a3c2..a0a4f17 100644
--- a/www/medic.js
+++ b/www/medic.js
@@ -40,8 +40,9 @@
   xhr.onload = function() {
     if (xhr.readyState == 4 && xhr.status == 200) {
       var cfg = JSON.parse(xhr.responseText);
-      exports.logurl = cfg.logurl;
+      exports.logurl = cfg.couchdb || cfg.logurl;
       exports.enabled = true;
+      exports.sha = cfg.sha;
       console.log('Loaded Medic Config: logurl=' + exports.logurl);
     }
     callback();