From 6e18ad8369634725634ea43df92634c79f4a6bce Mon Sep 17 00:00:00 2001 From: anshooarora Date: Wed, 21 Nov 2018 14:52:49 -0500 Subject: [PATCH 1/3] BDD view layout improvements --- .../view/v3html/test-view/v3-html-bdd.ftl | 46 ++++--- .../test-view/v3-html-test-view-charts.ftl | 121 +++++++++--------- .../view/v3html/v3-html-head.ftl | 2 +- .../view/v3html/v3-html-index.ftl | 2 +- 4 files changed, 88 insertions(+), 83 deletions(-) diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl index 2b37d5e..36598e5 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl @@ -1,71 +1,75 @@ +
+ ${MaterialIcon.getIcon(Status.PASS)} + ${MaterialIcon.getIcon(Status.FAIL)} + + clear +
<#if test.description?? && test.description?has_content> -
${ test.description}
+
${test.description}
<#list test.nodeContext.all as node> -
+
<#if node.hasCategory()>
<#list node.categoryContext.all as category> - ${ category.name } + ${category.name}
- ${ node.runDuration } -
-
${node.getBehaviorDrivenType().getSimpleName()}: ${ node.name }
+ ${node.runDuration} +
+
${MaterialIcon.getIcon(node.status)} ${node.getBehaviorDrivenType().getSimpleName()}: ${node.name}
<#if node.screenCaptureList?? && node.screenCaptureList?size != 0> <#if node.description?? && node.description?has_content> - ${ node.description } + ${node.description}
<#if node.hasChildren()>
    <#list node.nodeContext.all as child> -
  • -
    ${ child.name }
    +
  • +
    ${MaterialIcon.getIcon(child.status)}${child.name}
    <#if child.screenCaptureList?? && child.screenCaptureList?size != 0> <#if child.description?? && child.description?has_content> - ${ child.description } + ${child.description} <#list child.logContext.all as log> <#if log.exceptionInfo??> <#else> - ${log.details} +
    ${log.details}
    <#if child.hasChildren()>
      <#list child.nodeContext.all as gc> -
    • -
      ${ gc.name }
      +
    • +
      ${MaterialIcon.getIcon(gc.status)}${gc.name}
      <#if gc.screenCaptureList?? && gc.screenCaptureList?size != 0> <#if gc.description?? && gc.description?has_content> - ${ gc.description } + ${gc.description} <#list gc.logContext.all as log> - <#if log.exceptionInfo??> - - <#else> - ${log.details} + <#if log.exceptionInfo??> + <#else>
      ${log.details}
      • diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-test-view-charts.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-test-view-charts.ftl index b092d8f..197c2b1 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-test-view-charts.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-test-view-charts.ftl @@ -5,65 +5,66 @@ <#if bddReport || (report.reportStatusStats.childCount != 0 && report.reportStatusStats.grandChildCount != 0)> <#assign sizeLarge='s12 m4 l4'> +<#assign chartWidth="90" chartHeight="70" chartBoxHeight="94">
      -
      -
      -
      -
      ${ parentViewChartsHeading }
      -
      - -
      -
      - ${ report.reportStatusStats.parentCountPass } ${parentLabel} passed -
      -
      - ${ report.reportStatusStats.parentCountFail + report.reportStatusStats.parentCountFatal } ${parentLabel} failed, ${ report.reportStatusStats.parentCountError + report.reportStatusStats.parentCountWarning + report.reportStatusStats.parentCountSkip } others -
      -
      -
      - <#if report.reportStatusStats.childCount != 0> -
      -
      -
      ${ childViewChartsHeading }
      -
      - -
      -
      - ${ report.reportStatusStats.childCountPass } ${childLabel} passed -
      -
      - ${ report.reportStatusStats.childCountFail + report.reportStatusStats.childCountFatal } ${childLabel} failed, ${ report.reportStatusStats.childCountError + report.reportStatusStats.childCountWarning + report.reportStatusStats.childCountSkip + report.reportStatusStats.childCountInfo } others -
      -
      -
      - - <#if report.reportStatusStats.grandChildCount != 0> -
      -
      -
      ${ grandChildViewChartsHeading }
      -
      - -
      -
      - ${ report.reportStatusStats.grandChildCountPass } ${grandChildLabel} passed -
      -
      - ${ report.reportStatusStats.grandChildCountFail + report.reportStatusStats.grandChildCountFatal } ${grandChildLabel} failed, ${ report.reportStatusStats.grandChildCountSkip + report.reportStatusStats.grandChildCountError + report.reportStatusStats.grandChildCountWarning + report.reportStatusStats.grandChildCountInfo } others -
      -
      -
      - -
      - <#if enableTimeline=='true'> -
      -
      -
      -
      Timeline (seconds)
      -
      - -
      -
      -
      -
      - +
      +
      +
      +
      ${ parentViewChartsHeading }
      +
      + +
      +
      + ${ report.reportStatusStats.parentCountPass } ${parentLabel} passed +
      +
      + ${ report.reportStatusStats.parentCountFail + report.reportStatusStats.parentCountFatal } ${parentLabel} failed, ${ report.reportStatusStats.parentCountError + report.reportStatusStats.parentCountWarning + report.reportStatusStats.parentCountSkip } others +
      +
      +
      + <#if report.reportStatusStats.childCount != 0> +
      +
      +
      ${ childViewChartsHeading }
      +
      + +
      +
      + ${ report.reportStatusStats.childCountPass } ${childLabel} passed +
      +
      + ${ report.reportStatusStats.childCountFail + report.reportStatusStats.childCountFatal } ${childLabel} failed, ${ report.reportStatusStats.childCountError + report.reportStatusStats.childCountWarning + report.reportStatusStats.childCountSkip + report.reportStatusStats.childCountInfo } others +
      +
      +
      + + <#if report.reportStatusStats.grandChildCount != 0> +
      +
      +
      ${ grandChildViewChartsHeading }
      +
      + +
      +
      + ${ report.reportStatusStats.grandChildCountPass } ${grandChildLabel} passed +
      +
      + ${ report.reportStatusStats.grandChildCountFail + report.reportStatusStats.grandChildCountFatal } ${grandChildLabel} failed, ${ report.reportStatusStats.grandChildCountSkip + report.reportStatusStats.grandChildCountError + report.reportStatusStats.grandChildCountWarning + report.reportStatusStats.grandChildCountInfo } others +
      +
      +
      + +
      + <#if enableTimeline=='true'> +
      +
      +
      +
      Timeline (seconds)
      +
      + +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-head.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-head.ftl index 90ee1ba..d9855df 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-head.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-head.ftl @@ -10,7 +10,7 @@ - + ${ config.getValue('documentTitle') } diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl index 27a5e54..4d5efea 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl @@ -108,7 +108,7 @@ <#if config.getValue('offline')?string == 'true'> <#else> - + <#assign hide=(chartVisibleOnOpen=='true')?then(false, true)> <#if hide> From 7386c3f326c8b385f225b710453cbf539607ef2d Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 22 Nov 2018 12:57:04 -0500 Subject: [PATCH 2/3] bdd: add missing screencapture info for steps [CRITICAL] --- .../view/v3html/test-view/v3-html-bdd.ftl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl index 36598e5..0088a86 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl @@ -46,11 +46,12 @@ ${child.description} <#list child.logContext.all as log> - <#if log.exceptionInfo??> - - <#else> -
      ${log.details}
      - + <#if log.exceptionInfo??> + + <#else> +
      ${log.details}
      + + <#if log.hasScreenCapture()>${log.screenCaptureContext.last.source} <#if child.hasChildren()>
        @@ -69,8 +70,8 @@ <#list gc.logContext.all as log> <#if log.exceptionInfo??> - <#else>
        ${log.details}
        - + <#else>
        ${log.details}
        + <#if log.hasScreenCapture()>${log.screenCaptureContext.last.source} From 28cc2cc0476470d8cf1bfadbca9332c44c935b6c Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 22 Nov 2018 13:05:05 -0500 Subject: [PATCH 3/3] release 4.0.5 --- pom-nexus.xml | 2 +- pom.xml | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pom-nexus.xml b/pom-nexus.xml index 53f3dda..04667c0 100644 --- a/pom-nexus.xml +++ b/pom-nexus.xml @@ -4,7 +4,7 @@ com.aventstack extentreports - 4.0.4 + 4.0.5 extentreports www.extentreports.com diff --git a/pom.xml b/pom.xml index 53f3dda..193d6b9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.aventstack extentreports - 4.0.4 + 4.0.5 extentreports www.extentreports.com @@ -112,20 +112,6 @@ maven-resources-plugin 2.7 - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - -