CB-8070 MedicReporter from plugin-test-framework incompatible with me…

…dic couch db structure. It's fixed.
apache · Nov 25, 2014 · 357b899 · janpio · Nov 24, 2018 · 357b899
1 parent babbc4e
commit 357b899
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/www/assets/jasmine-medic.js b/www/assets/jasmine-medic.js
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -99,7 +99,8 @@ jasmineRequire.MedicReporter = function(j$) {
       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 @@ jasmineRequire.MedicReporter = function(j$) {
       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));
     }

diff --git a/www/jasmine_helpers.js b/www/jasmine_helpers.js
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -81,13 +81,17 @@ function addJasmineReporters(jasmineInterface, jasmineEnv) {
     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 }
-        });
-        jasmineInterface.MedicReporter.initialize();
-        jasmineEnv.addReporter(jasmineInterface.MedicReporter);
-    }
+    medic.load(function () {
+        if (medic.enabled) {
+            jasmineRequire.medic(jasmineInterface.jasmine);
+            jasmineInterface.MedicReporter = new jasmineInterface.jasmine.MedicReporter({
+                env: jasmineEnv,
+                log: { logurl: medic.logurl },
+                sha: medic.sha
+            });
+            jasmineInterface.MedicReporter.initialize();
+            jasmineEnv.addReporter(jasmineInterface.MedicReporter);
+        }
+    });
+
 }
diff --git a/www/medic.js b/www/medic.js
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -36,12 +36,13 @@ exports.log = function() {
 
 exports.load = function (callback) {
   var xhr = new XMLHttpRequest();
-  xhr.open("GET", "../medic.json", true);
+  xhr.open("GET", "medic.json", true);
   xhr.onload = function() {
     if (xhr.readyState == 4 && xhr.status == 200) {
       var cfg = JSON.parse(xhr.responseText);
-      exports.logurl = cfg.logurl;
+      exports.logurl = cfg.couchdb;
       exports.enabled = true;
+      exports.sha = cfg.sha;
       console.log('Loaded Medic Config: logurl=' + exports.logurl);
     }
     callback();