ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpav...@apache.org
Subject [ignite-teamcity-bot] branch master updated: IGNITE-9542 Test history jumping from left to rigth in case it is not found in the DB
Date Thu, 29 Nov 2018 14:03:50 GMT
This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/master by this push:
     new a1953b8  IGNITE-9542 Test history jumping from left to rigth in case it is not found
in the DB
a1953b8 is described below

commit a1953b8a869ff61f816594c9bc3f6d080a4faeff
Author: Dmitriy Pavlov <dpavlov@apache.org>
AuthorDate: Thu Nov 29 17:03:46 2018 +0300

    IGNITE-9542 Test history jumping from left to rigth in case it is not found in the DB
---
 .../src/main/webapp/js/testfails-2.1.js                 | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
index eead52c..9f5dece 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
@@ -775,8 +775,12 @@ function showTestFailData(testFail, isFailureShown, settings) {
     }
 
     // has both base and current, draw current latest runs here.
-    var comparePage = isDefinedAndFilled(testFail.histCurBranch) && isDefinedAndFilled(testFail.histCurBranch.latestRuns)
-        && isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns);
+    var comparePage =
+        findGetParameter('action') != null
+        || (
+            isDefinedAndFilled(testFail.histCurBranch) && isDefinedAndFilled(testFail.histCurBranch.latestRuns)
+            && isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns)
+        );
 
     var baseBranchMarks = "";
 
@@ -810,9 +814,10 @@ function showTestFailData(testFail, isFailureShown, settings) {
     if (haveWeb)
         res += "<a href='" + testFail.webUrl + "'>";
 
-    if(comparePage)
-        res += drawLatestRuns(testFail.histCurBranch.latestRuns);
-    else if(isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns))
+    if(comparePage) {
+        if (isDefinedAndFilled(testFail.histCurBranch))
+            res += drawLatestRuns(testFail.histCurBranch.latestRuns);
+    } else if(isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns))
         res += drawLatestRuns(testFail.histBaseBranch.latestRuns); // has only base branch
 
     if (haveWeb)
@@ -872,7 +877,7 @@ function showTestFailData(testFail, isFailureShown, settings) {
 
         histContent += "</span>";
 
-        if(comparePage)  {
+        if(comparePage && isDefinedAndFilled(testFail.histBaseBranch) &&
isDefinedAndFilled(testFail.histBaseBranch.latestRuns))  {
              histContent += " " + drawLatestRuns(testFail.histBaseBranch.latestRuns); //
has both base and current, draw current base runs here.
         }
     } else if (haveWeb) {


Mime
View raw message