Merge branch 'development' of github.com:kgrgreer/foam3 into development

Author: kgrgreer

src/foam/core/test/TestBorder.js

@@ -160,9 +160,15 @@ foam.CLASS({
             if ( t.failed ) {
               self.failed += t.failed;
               if ( testRun ) {
-                // TODO: capture individual tests failures on the test,
-                // so they can be added here.
                 testRun.failures.push(t.id);
+                if ( t.output ) {
+                  var lines = t.output.split('\n');
+                  for ( var i = 0 ; i < lines.length ; i++ ) {
+                    if ( lines[i].startsWith('FAILURE') ) {
+                      testRun.failures.push(lines[i]);
+                    }
+                  }
+                }
               }
             }
           } catch (e) {

src/foam/core/test/TestRunnerScript.js

@@ -213,6 +213,7 @@ This will also keep the foam application running for inspection from the GUI.
           exitCode = 1;
       }
       if ( clientTestRun != null ) {
+        reportClientTestDetails(x, clientTests);
         reportResults(x, clientTestRun, runTime);
         if (clientTestRun.getFailed() > 0 )
           exitCode = 1;
@@ -493,7 +494,31 @@ This will also keep the foam application running for inspection from the GUI.
       };
       agent.setHeadless( ! Boolean.getBoolean(SYSTEM_TEST_HEADED) );
       agent.execute(x);
-      return (TestRun) dao.find(testRun.getId());
+      TestRun result = (TestRun) dao.find(testRun.getId());
+      if ( ! result.getCompleted() ) {
+        result = (TestRun) result.fclone();
+        result.setCompleted(true);
+        result.setFailed(result.getFailed() + 1);
+        result.setTests(result.getTests() + 1);
+        List<String> failures = result.getFailures() != null ? new ArrayList<>((List<String>) result.getFailures()) : new ArrayList<>();
+        failures.add("FAILURE: Client tests timed out after " + agent.getTimeout() + " seconds. Tests may still be running in the browser.");
+        result.setFailures(failures);
+        result = (TestRun) dao.put(result);
+      }
+      return result;
+      `
+    },
+    {
+      name: 'reportClientTestDetails',
+      args: 'X x, List tests',
+      javaCode: `
+        DAO testDAO = (DAO) x.get("testDAO");
+        for ( Test test : (List<Test>) tests ) {
+          test = (Test) testDAO.find(test.getId());
+          if ( test == null ) continue;
+          printBold(test.getId());
+          printOutput(test);
+        }
       `
     },
     {

src/foam/u2/view/LazyScrollManager.js

@@ -285,7 +285,14 @@ foam.CLASS({
       documentation: 'Tracks the first page where each group appears.',
       factory: function() { return {}; }
     },
-    ['suspendObserver', false]
+    ['suspendObserver', false],
+    {
+      name: 'refreshId', 
+      documentation: 'UID used to prevent old data from corrupting the refresh process',
+      factory: function() {
+        return foam.next$UID();
+      }
+    }
   ],
 
   methods: [
@@ -494,10 +501,13 @@ foam.CLASS({
         sortParams.push(this.invertGroupingOrder ? this.DESC(this.groupBy) : this.groupBy);
       if ( this.order ) sortParams.push(this.order);
       if ( sortParams.length ) proxy = proxy.orderBy(sortParams);
+      let refreshId = this.refreshId;
 
       this.loadingPages_$set(page);
-
       return this.prepDAO(proxy, this.ctx).then((values) => { 
+        // This means a refresh was triggered while the call was in-flight
+        // discard any calls since they might have old data
+        if ( this.refreshId !== refreshId ) return;
         if ( page < this.currentTopPage_ || page > this.currentTopPage_ + this.NUM_PAGES_TO_RENDER) {
           // console.debug('Skipping load', page);
           this.loadingPages_$remove(page);
@@ -631,6 +641,8 @@ foam.CLASS({
         this.groupFirstPage_ = {};
         this.pageHeights_   = {};
         this.loadingPages_   = {};
+        this.loadedPages_   = {};
+        this.renderedPages_   = {};
         if ( ! this.isInit ) {
           this.currentTopPage_ = 0;
           this.topRow          = 0;
@@ -645,6 +657,7 @@ foam.CLASS({
         // Re-attach sentinel observer after disconnect
         this.topSpacer_?.el().then(el    => this.sentinelObserver_?.observe(el));
         this.bottomSpacer_?.el().then(el => this.sentinelObserver_?.observe(el));
+        this.clearProperty('refreshId');
         this.updateRenderedPages();
         if ( this.topRow > 1 ) this.scrollToIndex = this.topRow;
       }