From 312cd3abe79fe237b5bfe798b1d9b2ef946656fe Mon Sep 17 00:00:00 2001 From: Erik Smith Date: Thu, 6 Feb 2020 13:44:53 -0600 Subject: [PATCH 1/6] Prevent ClassCastException in the BasicFileReporter (#123) * prevent ClassCastException in the BasicFileReporter * fix a small bug in the enforceOfflineMode method --- .../aventstack/extentreports/reporter/BasicFileReporter.java | 4 ++-- .../configuration/ExtentHtmlReporterConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java b/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java index 92cf3b3..9caf04a 100644 --- a/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java +++ b/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java @@ -167,8 +167,8 @@ protected Configuration getFreemarkerConfig() { protected Boolean enforceOfflineMode() { if (getConfigurationStore().containsConfig("enableOfflineMode")) { - String offlineMode = String.valueOf(getConfigurationStore().containsConfig("enableOfflineMode")); - if (!getConfigurationStore().containsConfig("offlineDirectory") && offlineMode.equals("true")) { + String offlineMode = String.valueOf(getConfigurationStore().getConfig("enableOfflineMode")); + if (!getConfigurationStore().containsConfig("offlineDirectory") && Boolean.parseBoolean(offlineMode)) { return true; } } diff --git a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java index b7f5915..b44b73b 100644 --- a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java +++ b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java @@ -5,8 +5,8 @@ import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.offline.OfflineResxDelegate; +import com.aventstack.extentreports.reporter.BasicFileReporter; import com.aventstack.extentreports.reporter.ExtentHtmlReporter; -import com.aventstack.extentreports.reporter.ExtentSparkReporter; import com.aventstack.extentreports.utils.FileUtil; /** @@ -28,7 +28,7 @@ public void enableOfflineMode(Boolean offline) { getConfigurationStore().storeConfig("enableOfflineMode", String.valueOf(offline)); getConfigurationStore().storeConfig("offlineDirectory", getReporter().getReporterName() + "/"); if (offline) { - File f = getTargetDirectory(((ExtentSparkReporter) getReporter()).getFileFile()); + File f = getTargetDirectory(((BasicFileReporter) getReporter()).getFileFile()); String s = "/"; String resourcePackagePath = ExtentReports.class.getPackage().getName().replace(".", s); resourcePackagePath += s + "offline" + s; From 4dcae3b5923ffe453019319be040c8e93ad99dc9 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 15:10:38 -0800 Subject: [PATCH 2/6] deprecate ExtentHtmlReporter --- .../aventstack/extentreports/reporter/ExtentHtmlReporter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java b/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java index 11c7d40..93ec7da 100644 --- a/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java +++ b/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java @@ -15,6 +15,7 @@ * The ExtentSparkReporter creates a rich standalone spark file. It allows * several configuration options via the config() method. */ +@Deprecated public class ExtentHtmlReporter extends BasicFileReporter { private static final Logger logger = Logger.getLogger(ExtentHtmlReporter.class.getName()); From 50bf98f6f7dc0186bcd950706f80de686ed9bb44 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 19:33:53 -0800 Subject: [PATCH 3/6] fixes #124 --- .../view/v3html/test-view/v3-html-bdd.ftl | 152 ++++++++++-------- .../extentreports/reporter/Base64Tests.java | 50 ++++++ 2 files changed, 133 insertions(+), 69 deletions(-) create mode 100644 src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java 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 c4fd719..1b33f2e 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,78 +1,92 @@
- ${MaterialIcon.getIcon(Status.PASS)} - ${MaterialIcon.getIcon(Status.FAIL)} - - clear + ${MaterialIcon.getIcon(Status.PASS)} + ${MaterialIcon.getIcon(Status.FAIL)} + + clear
<#if test.description?? && test.description?has_content>
${test.description}
<#list test.nodeContext.all as node>
- <#if TestService.testHasCategory(node)> -
- <#list node.categoryContext.all as category> - ${category.name} - -
- - ${TestService.getRunDuration(node)} -
-
${MaterialIcon.getIcon(node.status)} ${node.behaviorDrivenTypeName}: ${node.name}
- <#if TestService.testHasScreenCapture(node)> -
    - <#list node.screenCaptureContext.all as sc> -
  • panorama
    • - -
- - <#if node.description?? && node.description?has_content> - ${node.description} - -
- <#if TestService.testHasChildren(node)> -
    - <#list node.nodeContext.all as child> -
  • -
    ${MaterialIcon.getIcon(child.status)}${child.name}
    - <#if TestService.testHasScreenCapture(child)> -
      - <#list child.screenCaptureContext.all as sc> -
    • panorama
      • - -
    - - <#list child.logContext.all as log> - <#if log.exceptionInfo??> - - <#else> -
    ${log.details}
    - - - <#if TestService.testHasChildren(child)> -
      - <#list child.nodeContext.all as gc> -
    • -
      ${MaterialIcon.getIcon(gc.status)}${gc.name}
      - <#if TestService.testHasScreenCapture(gc)> -
        - <#list gc.screenCaptureContext.all as sc> -
      • panorama
        • - -
      - - <#list gc.logContext.all as log> - <#if log.exceptionInfo??> - <#else>
      ${log.details}
      - - -
      • - -
    - -
    • - -
- + <#if TestService.testHasCategory(node)> +
+ <#list node.categoryContext.all as category> + ${category.name} + +
+ + ${TestService.getRunDuration(node)} +
+
${MaterialIcon.getIcon(node.status)} ${node.behaviorDrivenTypeName}: ${node.name}
+ <#if TestService.testHasScreenCapture(node)> +
    + <#list node.screenCaptureContext.all as sc> + <#if sc.path??> +
  • panorama
    • + <#elseif sc.isBase64()> +
  • panorama
    • + + +
+ + <#if node.description?? && node.description?has_content> + ${node.description} + +
+ <#if TestService.testHasChildren(node)> +
    + <#list node.nodeContext.all as child> +
  • +
    ${MaterialIcon.getIcon(child.status)}${child.name}
    + <#if TestService.testHasScreenCapture(child)> +
      + <#list child.screenCaptureContext.all as sc> + <#if sc.path??> +
    • panorama
      • + <#elseif sc.isBase64()> +
    • panorama
      • + + +
    + + <#list child.logContext.all as log> + <#if log.exceptionInfo??> + + <#else> +
    ${log.details}
    + + + <#if TestService.testHasChildren(child)> +
      + <#list child.nodeContext.all as gc> +
    • +
      ${MaterialIcon.getIcon(gc.status)}${gc.name}
      + <#if TestService.testHasScreenCapture(gc)> +
        + <#list gc.screenCaptureContext.all as sc> + <#if sc.path??> +
      • panorama
        • + <#elseif sc.isBase64> +
      • panorama
        • + + +
      + + <#list gc.logContext.all as log> + <#if log.exceptionInfo??> + + <#else> +
      ${log.details}
      + + +
      • + +
    + +
    • + +
+
\ No newline at end of file diff --git a/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java b/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java new file mode 100644 index 0000000..c86fa3f --- /dev/null +++ b/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java @@ -0,0 +1,50 @@ +package com.aventstack.extentreports.reporter; + +import org.testng.annotations.Test; + +import com.aventstack.extentreports.ExtentReports; +import com.aventstack.extentreports.gherkin.model.Feature; +import com.aventstack.extentreports.gherkin.model.Given; +import com.aventstack.extentreports.gherkin.model.Scenario; + +public class Base64Tests { + + private final static String BASE64 = ""; + + @Test + public void testBase64BDDAtFeature() { + ExtentReports extent = new ExtentReports(); + ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html"); + ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html"); + extent.attachReporter(html, spark); + extent.createTest(Feature.class, "Feature") + .addScreenCaptureFromBase64String(BASE64); + extent.flush(); + } + + @Test + public void testBase64BDDAtScenario() { + ExtentReports extent = new ExtentReports(); + ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html"); + ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html"); + extent.attachReporter(html, spark); + extent.createTest(Feature.class, "Feature") + .createNode(Scenario.class, "Scenario") + .addScreenCaptureFromBase64String(BASE64); + extent.flush(); + } + + @Test + public void testBase64BDDAtStep() { + ExtentReports extent = new ExtentReports(); + ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html"); + ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html"); + extent.attachReporter(html, spark); + extent.createTest(Feature.class, "Feature") + .createNode(Scenario.class, "Scenario") + .createNode(Given.class, "Given") + .addScreenCaptureFromBase64String(BASE64); + extent.flush(); + } + +} From 0a86ca345c5952ed74ae01b19ce96817a705d935 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 19:36:42 -0800 Subject: [PATCH 4/6] fixes tests, use Spark as default --- ...tmlBasicFileReporterConfigurationTest.java | 26 +++++----- .../HtmlConfigurableReporterTest.java | 20 ++++---- ...HtmlRichViewReporterConfigurationTest.java | 48 +++++++------------ 3 files changed, 39 insertions(+), 55 deletions(-) diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java index 6a18c37..9d9b6a7 100644 --- a/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java +++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java @@ -11,20 +11,20 @@ public class HtmlBasicFileReporterConfigurationTest extends Base { @Test public void htmlReporterHasInitialConfig(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); Assert.assertFalse(html.getConfigurationStore().isEmpty()); } @Test public void testHtmlReporterUserConfigInitialCSSNull(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String v = (String) html.getConfigurationStore().getConfig("css"); Assert.assertNull(v); } @Test public void testHtmlReporterUserConfigCSSHasValue(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String css = ".dark{background:black;}"; html.config().setCSS(css); String v = (String) html.getConfigurationStore().getConfig("css"); @@ -33,7 +33,7 @@ public void testHtmlReporterUserConfigCSSHasValue(Method method) { @Test public void testHtmlReporterUserConfigCSSValue(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String css = ".dark{background:black;}"; html.config().setCSS(css); String v = (String) html.getConfigurationStore().getConfig("css"); @@ -42,14 +42,14 @@ public void testHtmlReporterUserConfigCSSValue(Method method) { @Test public void testHtmlReporterUserConfigInitialJSNull(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String v = (String) html.getConfigurationStore().getConfig("js"); Assert.assertNull(v); } @Test public void testHtmlReporterUserConfigJSHasValue(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); html.config().setJS("alert('');"); String v = (String) html.getConfigurationStore().getConfig("js"); Assert.assertFalse(v.isEmpty()); @@ -57,7 +57,7 @@ public void testHtmlReporterUserConfigJSHasValue(Method method) { @Test public void testHtmlReporterUserConfigJSValue(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String js = "alert('');"; html.config().setJS(js); String v = (String) html.getConfigurationStore().getConfig("js"); @@ -66,20 +66,20 @@ public void testHtmlReporterUserConfigJSValue(Method method) { @Test public void documentTitleInitialValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); Assert.assertFalse(html.getConfigurationStore().getConfig("documentTitle").toString().isEmpty()); } @Test public void documentTitleInitialUserValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String v = (String) html.getConfigurationStore().getConfig("documentTitle"); Assert.assertNotNull(v); } @Test public void documentTitleUserValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String docTitle = "test"; html.config().setDocumentTitle(docTitle); String v = (String) html.getConfigurationStore().getConfig("documentTitle"); @@ -88,20 +88,20 @@ public void documentTitleUserValueTest(Method method) { @Test public void encodingInitialValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); Assert.assertTrue(html.getConfigurationStore().getConfig("encoding").toString().equalsIgnoreCase("utf-8")); } @Test public void encodingInitialUserValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String v = (String) html.getConfigurationStore().getConfig("encoding"); Assert.assertNotNull(v); } @Test public void encodingUserValueTest(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); + ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html"); String encoding = "utf-16"; html.config().setEncoding(encoding); String v = (String) html.getConfigurationStore().getConfig("encoding"); diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java index 7c2bca2..73c6aa7 100644 --- a/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java +++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java @@ -19,47 +19,47 @@ public class HtmlConfigurableReporterTest extends Base { private static final String CSS = ".test.active { border: 1px solid #ccc; }"; private static final String JS = "$('.test').click(function() { console.log('test'); });"; - private ExtentHtmlReporter html; + private ExtentSparkReporter spark; @BeforeClass public void beforeClass() { - html = new ExtentHtmlReporter("Extent.html"); - html.loadXMLConfig(CONFIG_PATH); + spark = new ExtentSparkReporter("Extent.html"); + spark.loadXMLConfig(CONFIG_PATH); } @Test public void testTheme(Method method) { - Assert.assertEquals(html.getConfigurationStore().getConfig("theme"), THEME); + Assert.assertEquals(spark.getConfigurationStore().getConfig("theme"), THEME); } @Test public void testEncoding(Method method) { - Assert.assertTrue(String.valueOf(html.getConfigurationStore().getConfig("encoding")).equalsIgnoreCase(ENCODING)); + Assert.assertTrue(String.valueOf(spark.getConfigurationStore().getConfig("encoding")).equalsIgnoreCase(ENCODING)); } @Test public void testDocumentTitle(Method method) { - Assert.assertEquals(html.getConfigurationStore().getConfig("documentTitle"), DOCUMENT_TITLE); + Assert.assertEquals(spark.getConfigurationStore().getConfig("documentTitle"), DOCUMENT_TITLE); } @Test public void testReportName(Method method) { - Assert.assertEquals(html.getConfigurationStore().getConfig("reportName"), REPORT_NAME); + Assert.assertEquals(spark.getConfigurationStore().getConfig("reportName"), REPORT_NAME); } @Test public void testTimestampFormat(Method method) { - Assert.assertEquals(html.getConfigurationStore().getConfig("timeStampFormat"), TIMESTAMP_FORMAT); + Assert.assertEquals(spark.getConfigurationStore().getConfig("timeStampFormat"), TIMESTAMP_FORMAT); } @Test public void testCSS(Method method) { - Assert.assertTrue(html.getConfigurationStore().getConfig("styles").toString().contains(CSS)); + Assert.assertTrue(spark.getConfigurationStore().getConfig("styles").toString().contains(CSS)); } @Test public void testJS(Method method) { - Assert.assertTrue(html.getConfigurationStore().getConfig("scripts").toString().contains(JS)); + Assert.assertTrue(spark.getConfigurationStore().getConfig("scripts").toString().contains(JS)); } } diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java index 566c560..6ddbde5 100644 --- a/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java +++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java @@ -12,65 +12,49 @@ public class HtmlRichViewReporterConfigurationTest { @Test public void testHtmlReporterUserConfigEnableTimelineEnabled(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().enableTimeline(true); - String v = (String) html.getConfigurationStore().getConfig("enableTimeline"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + spark.config().enableTimeline(true); + String v = (String) spark.getConfigurationStore().getConfig("enableTimeline"); Assert.assertEquals(v, String.valueOf(true)); } @Test public void testHtmlReporterUserConfigEnableTimelineDisabled(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().enableTimeline(false); - String v = (String) html.getConfigurationStore().getConfig("enableTimeline"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + spark.config().enableTimeline(false); + String v = (String) spark.getConfigurationStore().getConfig("enableTimeline"); Assert.assertEquals(v, String.valueOf(false)); } - /* - @Test - public void testHtmlReporterUserConfigAutoConfigMediaEnabled(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().setAutoCreateRelativePathMedia(true); - String v = (String) html.getConfigurationStore().getConfig("autoCreateRelativePathMedia"); - Assert.assertEquals(v, String.valueOf(true)); - } - @Test - public void testHtmlReporterUserConfigAutoConfigMediaDisabled(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().setAutoCreateRelativePathMedia(false); - String v = (String) html.getConfigurationStore().getConfig("autoCreateRelativePathMedia"); - Assert.assertEquals(v, String.valueOf(false)); - } - */ @Test public void testHtmlReporterUserConfigDetaultProtocol(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - String v = (String) html.getConfigurationStore().getConfig("protocol"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + String v = (String) spark.getConfigurationStore().getConfig("protocol"); Assert.assertEquals(Enum.valueOf(Protocol.class, v.toUpperCase()), Protocol.HTTPS); } @Test public void testHtmlReporterUserConfigProtocolSetting(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().setProtocol(Protocol.HTTP); - Object p = html.getConfigurationStore().getConfig("protocol"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + spark.config().setProtocol(Protocol.HTTP); + Object p = spark.getConfigurationStore().getConfig("protocol"); Protocol v = Protocol.valueOf(String.valueOf(p).toUpperCase()); Assert.assertEquals(v, Protocol.HTTP); } @Test public void testHtmlReporterUserConfigDetaultTheme(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - Object t = html.getConfigurationStore().getConfig("theme"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + Object t = spark.getConfigurationStore().getConfig("theme"); Theme theme = Theme.valueOf(String.valueOf(t).toUpperCase()); Assert.assertEquals(theme, Theme.STANDARD); } @Test public void testHtmlReporterUserConfigThemeSetting(Method method) { - ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html"); - html.config().setTheme(Theme.DARK); - Object t = html.config().getConfigurationStore().getConfig("theme"); + ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html"); + spark.config().setTheme(Theme.DARK); + Object t = spark.config().getConfigurationStore().getConfig("theme"); Theme theme = Theme.valueOf(String.valueOf(t).toUpperCase()); Assert.assertEquals(theme, Theme.DARK); } From 4c9c607a1b010c81b68a0f6b46c75291492031ac Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 19:45:30 -0800 Subject: [PATCH 5/6] closes #119 --- .../view/spark/partials/standard-content.ftl | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 index 0cbdf50..c03fe81 100644 --- 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 @@ -8,19 +8,8 @@
    <#list test.screenCaptureContext.all as sc>
  • - -
    - -
    -
    - <#if sc.isBase64()> - base64 - 0Kb - <#else> - ${sc.name} - ${sc.fileSize}Kb - -
    +     + ${sc.source}
    • From 8bb775edc9f5e682f94eab5979ae6383b36fe117 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 20:00:28 -0800 Subject: [PATCH 6/6] release 4.1.3 --- .gitignore | 3 ++ CHANGELOG.md | 11 +++++++ pom-nexus.xml | 2 +- pom.xml | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 99 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d311a43..743211d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ hs_err_pid* target/ test-output/ *.iml + +# nexus +deploycmd.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ff9697..ca627b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [4.1.3](https://github.com/extent-framework/extentreports-java/compare/v4.1.2...v4.1.3) +#### Improvements +* [#119] `ExtentSparkReporter` now displays thumbnails as default + +#### Fixes +* [#123] Prevent class cast exception in `ExtentHtmlReporterConfiguration` +* [#124] Fixes issue with `ExtentHtmlReporter` throwing freemarker errors due to image path being empty + +#### Deprecation +* ExtentHtmlReporter has been deprecated. ExtentSparkReporter is the default reporter starting version 4 and it now supports SPA-style view by default. + ## [4.1.2](https://github.com/extent-framework/extentreports-java/compare/v4.1.1...v4.1.2) #### Improvements * [#114] Tags tab lost a display of a full name of test diff --git a/pom-nexus.xml b/pom-nexus.xml index 6f0ec20..084aa94 100644 --- a/pom-nexus.xml +++ b/pom-nexus.xml @@ -5,7 +5,7 @@ com.aventstack extentreports - 4.1.2 + 4.1.3 extentreports www.extentreports.com diff --git a/pom.xml b/pom.xml index feb05d5..084aa94 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.aventstack extentreports - 4.1.2 + 4.1.3 extentreports www.extentreports.com @@ -114,9 +114,92 @@ maven-resources-plugin 2.7 + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + + + prepare-agent + + + + report + test + + report + + + + + + + release-sign-artifacts + + + performRelease + true + + + + 41414BBD + + anshooarora + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.3 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.3 + + + attach-javadocs + + jar + + + + + + + + + ossrh