diff --git a/CHANGELOG.md b/CHANGELOG.md index e511b3b..50d57f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [4.0.9](https://github.com/extent-framework/extentreports-java/compare/v4.0.8...v4.0.9) +#### Improvements +* [#35] HtmlReporter, BDD: description to appear as tooltip instead of newline +* {#36] SparkReporter: display ScenarioOutline children as toggles +* [#37] SparkReporter: auto-size textarea on click +* [#42] CategoryView status toggles +#### Fixes +* [#39] Test case name overlap test case timestamp Spark Reporter +* [#40] Author & device name don't have a background label +* [#43] SparkReporter: issue with `setCSS` not working + ## [4.0.8](https://github.com/extent-framework/extentreports-java/compare/v4.0.7...v4.0.8) #### Fixes * [#31] ExtentHtmlReporter does not display devices diff --git a/pom-nexus.xml b/pom-nexus.xml index 115e731..04f82ab 100644 --- a/pom-nexus.xml +++ b/pom-nexus.xml @@ -4,7 +4,7 @@ com.aventstack extentreports - 4.0.8 + 4.0.9 extentreports www.extentreports.com diff --git a/pom.xml b/pom.xml index 832e7e2..fb167f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.aventstack extentreports - 4.0.8 + 4.0.9 extentreports www.extentreports.com diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl new file mode 100644 index 0000000..48c9384 --- /dev/null +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl @@ -0,0 +1,74 @@ +<#macro stepdetails test> + <#if test.hasLog()> + <#list test.logContext.all as log> + <#if log.exceptionInfo??> + + <#else> +
${log.details}
+ + <#if log.hasScreenCapture()> + ${log.screenCaptureContext.last.source} + + + + + +<#if test.hasChildren()> +
+ <#list test.nodeContext.all as node> +
+ + <#if node.hasChildren()> + <#if node.behaviorDrivenTypeName=="Scenario Outline"> +
+ <#list node.nodeContext.all as child> +
+ +
+ <#list child.nodeContext.all as step> +
+ + + + ${step.name} +
+ <@stepdetails test=step /> + +
+
+ +
+ <#else> +
+
+ <#list node.nodeContext.all as child> +
+ + + + ${child.name} +
+ <@stepdetails test=child /> + +
+
+ + +
+ +
+ \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl index dcc8297..ccc1042 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl @@ -1,4 +1,4 @@ -<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="2bfb90a" jscommit="543bfe2" iconcommit="d74480e"> +<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="24cb10e" jscommit="24cb10e" iconcommit="d74480e"> <#if resourceCDN=="extentreports"> <#assign cdnURI="extentreports.com/resx" csscommit="" jscommit="" iconcommit=""> @@ -11,5 +11,5 @@ - + <#include "../../commons/commons-inject-css.ftl"> \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl new file mode 100644 index 0000000..17f4146 --- /dev/null +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl @@ -0,0 +1,34 @@ +<#if test.hasLog()> +
+ <@log test=test /> +
+ +<#if test.hasScreenCapture()> +
+ +
+ +<#if test.hasChildren()> +
+ <@recurse_nodes test=test /> +
+ \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/tag.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/tag.ftl index 324f950..dc3d07e 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/tag.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/tag.ftl @@ -46,9 +46,9 @@

${context.name}

- <#if context.passed!=0>${context.passed} passed - <#if context.failed!=0>${context.failed} failed - <#if context.skipped!=0>${context.skipped} skipped + <#if context.passed!=0>${context.passed} passed + <#if context.failed!=0>${context.failed} failed + <#if context.skipped!=0>${context.skipped} skipped
@@ -60,7 +60,7 @@ <#list context.testList as test> - +
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/test.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/test.ftl index 9a8df98..510a085 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/test.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/test.ftl @@ -123,110 +123,9 @@
<#if !isbdd> - <#if test.hasLog()> -
- <@log test=test /> -
- - <#if test.hasScreenCapture()> -
- -
- - <#if test.hasChildren()> -
- <@recurse_nodes test=test /> -
- + <#include "partials/standard-content.ftl"> <#else> - <#if test.hasChildren()> -
- <#list test.nodeContext.all as node> -
- - <#if node.hasChildren()> -
-
- <#list node.nodeContext.all as child> - <#assign cls=""> - <#if child.hasChildren()><#assign cls="ml-3">
-
-
${child.name}
-
- -
-
- <#if child.hasLog()> - <#list child.logContext.all as log> - <#if log.exceptionInfo??> - - <#else> - ${log.details} - - <#if log.hasScreenCapture()> - ${log.screenCaptureContext.last.source} - - - -
- <#if child.hasChildren()> -
- <#list child.nodeContext.all as gc> -
${gc.name}
-
- -
-
- <#if gc.hasLog()> - <#list gc.logContext.all as log> - <#if log.exceptionInfo??> - - <#else> - ${log.details} - - <#if log.hasScreenCapture()> - ${log.screenCaptureContext.last.source} - - - - -
- - <#if child.hasChildren()>
- -
-
- -
- -
- + <#include "partials/bdd-content.ftl"> diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/category-view/v3-html-category-view.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/category-view/v3-html-category-view.ftl index b0ea1b9..eae1e24 100644 --- a/src/main/resources/com/aventstack/extentreports/view/v3html/category-view/v3-html-category-view.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/v3html/category-view/v3-html-category-view.ftl @@ -35,9 +35,9 @@
- <#if category.passed != 0>Passed: ${ category.passed } - <#if category.failed != 0>Failed: ${ category.failed } - <#if category.skipped != 0>Skipped: ${ category.skipped } + <#if category.passed != 0>Passed: ${ category.passed } + <#if category.failed != 0>Failed: ${ category.failed } + <#if category.skipped != 0>Skipped: ${ category.skipped }
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 effe4f8..160064c 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 @@ -34,7 +34,7 @@
    <#list node.nodeContext.all as child>
  • -
    ${MaterialIcon.getIcon(child.status)}${child.name}
    +
    ${MaterialIcon.getIcon(child.status)}${child.name}
    <#if child.screenCaptureList?? && child.screenCaptureList?size != 0>
      <#list child.screenCaptureList as sc> @@ -42,9 +42,6 @@
    - <#if child.description?? && child.description?has_content> - ${child.description} - <#list child.logContext.all as log> <#if log.exceptionInfo??> @@ -56,7 +53,7 @@
      <#list child.nodeContext.all as gc>
    • -
      ${MaterialIcon.getIcon(gc.status)}${gc.name}
      +
      ${MaterialIcon.getIcon(gc.status)}${gc.name}
      <#if gc.screenCaptureList?? && gc.screenCaptureList?size != 0>
        <#list gc.screenCaptureList as sc> @@ -64,9 +61,6 @@
      - <#if gc.description?? && gc.description?has_content> - ${gc.description} - <#list gc.logContext.all as log> <#if log.exceptionInfo??> <#else>
      ${log.details}
      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 0cfcf63..c454df8 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 @@ -37,7 +37,7 @@ <#assign timeStampFormat = config.getValue('timeStampFormat')> -<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="bad039f" jscommit="c23457b"> +<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="b65cd69" jscommit="b65cd69"> <#if resourceCDN=="extentreports"> <#assign cdnURI="extentreports.com/resx" csscommit="" jscommit="">