close #874 - add ScenarioOutline and additional level to denote Scena…

…rioOutline
anshooarora · May 11, 2017 · 2a9248e · 2a9248e
1 parent 0a77333
commit 2a9248e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/dist/css/extent.css b/dist/css/extent.css
diff --git a/src/main/java/com/aventstack/extentreports/GherkinKeyword.java b/src/main/java/com/aventstack/extentreports/GherkinKeyword.java
@@ -41,9 +41,9 @@ public class GherkinKeyword {
     public GherkinKeyword(String keyword) throws ClassNotFoundException {
         keyword = StringUtil.capitalize(keyword);
         String refPath = clazz.getPackage().getName();
-        Class<?> c = Class.forName(refPath + "." + keyword);
 
         try {
+            Class<?> c = Class.forName(refPath + "." + keyword);
             keywordClazz = (IGherkinFormatterModel) c.newInstance();
         } catch (InstantiationException|IllegalAccessException e) {
             logger.log(Level.SEVERE, "", e);

diff --git a/src/main/java/com/aventstack/extentreports/gherkin/model/ScenarioOutline.java b/src/main/java/com/aventstack/extentreports/gherkin/model/ScenarioOutline.java
@@ -0,0 +1,5 @@
+package com.aventstack.extentreports.gherkin.model;
+
+public class ScenarioOutline implements IGherkinFormatterModel {
+
+}
diff --git a/src/main/resources/com/aventstack/extentreports/view/html-report/test-view/bdd.ftl b/src/main/resources/com/aventstack/extentreports/view/html-report/test-view/bdd.ftl
@@ -9,7 +9,7 @@
 	</#if>
 	<span class='duration right label'>${ node.runDuration }</span>
 	<div class='desc'>
-		<b>${ node.getBehaviorDrivenType().getSimpleName()?capitalize }</b>
+		<b>${ node.getBehaviorDrivenType().getSimpleName() }</b>
 		<span class="desc-text">${ node.name }</span>
 		<#if node.screenCaptureList?? && node.screenCaptureList?size != 0>
 		<ul class='screenshots right'>
@@ -40,6 +40,29 @@
 			<#list child.logContext.all as log>
 				<div class='pre'>${ log.details }</div>
 			</#list>
+
+			<#if child.hasChildren()>
+				<ul class='steps'>
+				<#list child.nodeContext.all as grandchild>
+					<li test-id='${ grandchild.getID() }' class='node ${ grandchild.getBehaviorDrivenType().getSimpleName()?lower_case } ${ grandchild.status }' status='${ grandchild.status }'><b>${ grandchild.getBehaviorDrivenType().getSimpleName()?string }</b>
+						<span class="bdd-step-name">${ grandchild.name }</span>
+						<#if grandchild.screenCaptureList?? && grandchild.screenCaptureList?size != 0>
+						<ul class='screenshots right'>
+							<#list grandchild.screenCaptureList as sc>
+							<li><a data-featherlight="image" href="${ sc.path }"><i class='material-icons'>panorama</i></a></li>
+							</#list>
+						</ul>
+						</#if>
+						<#if grandchild.description?? && grandchild.description?has_content>
+						<div class='pre'>${ grandchild.description }</div>
+						</#if>
+						<#list grandchild.logContext.all as log>
+							<div class='pre'>${ log.details }</div>
+						</#list>
+					</li>
+				</#list>
+				</ul>
+			</#if>
 		</li>
 		</#list>
 	</ul>