[GNUnet-SVN] [taler-backoffice] 02/02: Adjust tests after logic -vs- presentation separation

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository backoffice.

commit 82430fdb89e2f5b589c36d7b0cdb1922ad10e11d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jan 12 14:08:32 2018 +0100

    Adjust tests after logic -vs- presentation separation
---
 js/backoffice.js | 13 +++++--------
 js/test/main.js  |  8 +++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/js/backoffice.js b/js/backoffice.js
index 91f6a81..fc00f77 100644
--- a/js/backoffice.js
+++ b/js/backoffice.js
@@ -148,9 +148,6 @@ module.exports.track_transfer = function(exchange, wtid, 
cb){
       switch(req.status){
       case 200:
         var tracks = JSON.parse(req.responseText);
-        /**
-         * close the popup which is now on the focus showing
-         * the tracks from one order. */
         cb(true, tracks.deposits_sums, tracks.execution_time, wtid);
         break;
       case 400:
@@ -178,7 +175,7 @@ module.exports.track_order = function(order_id, cb){
   req.open("GET", url, true);
   req.onload = function(){
     if (4 == req.readyState){
-      cb(tracks, req.status);
+      cb(JSON.parse(req.responseText), req.status);
       return;
     }
   }
@@ -330,8 +327,8 @@ function fill_table(refresh, data, execution_time, 
wtid_marker){
     td_amount.className = "amount";
     var td_date = document.createElement("td");
     td_date.className = "date";
-    td_order_id.innerHTML = `<a href="#${i}"` +
-      onclick='track_order("${entry.order_id}");'>` +
+    td_order_id.innerHTML = `<a href="#${i}"
+      onclick='track_order("${entry.order_id}");'>
       ${entry.order_id}</a>`;
     td_summary.className = "summary";
     td_summary.innerHTML = entry.summary;
@@ -510,8 +507,8 @@ document.addEventListener("scroll", function(){
        >= document.body.offsetHeight)
     window.setTimeout(function(){
       toggle_loader();
-      get_history(false, fill_table), 400);};
-});
+      get_history(false, fill_table);},
+      400);});
 
 /* Close dialog on ESC press */
 document.onkeydown = function(e) {
diff --git a/js/test/main.js b/js/test/main.js
index 58a3b48..cda4c9f 100644
--- a/js/test/main.js
+++ b/js/test/main.js
@@ -40,6 +40,10 @@ ava.test.beforeEach(t => {
     global.XMLHttpRequest = t.context.xhr;};
 
   function minor_mocks() {
+    var document = {};
+    document.addEventListener = ()=>{};
+    document.getElementById = ()=>{return {value: "mock"}};
+    global.document = document;
     global.alert = console.log;
     // disable logging for tests
     global.console.log = function(){};
@@ -65,8 +69,9 @@ ava.test("Tracking a wire transfer", (t) => {
   t.context.bo.track_transfer("http://exchange.mock/";, "mock-wtid", cb);
   t.context.requests[0].respond(200, "application/json",
                                 JSON.stringify(mock_tracks));
-  sinon.assert.calledWith(cb, true, mock_tracks.deposit_sums,
+  sinon.assert.calledWith(cb, true, mock_tracks.deposits_sums,
                           mock_tracks.execution_time, "mock-wtid");
+  t.pass();
 });
 
 ava.test("Tracking order id", t => {
@@ -91,4 +96,5 @@ ava.test("Tracking order id", t => {
      JSON.stringify(mock_tracks));
 
   sinon.assert.calledWith(cb, mock_tracks, 200);
+  t.pass();
 });

-- 
To stop receiving notification emails like this one, please contact
address@hidden