From 022bafb31359d15c51456e85a8316d7fa57e7bb9 Mon Sep 17 00:00:00 2001
From: jnernest <42038436+jnernest@users.noreply.github.com>
Date: Thu, 23 Jan 2020 11:08:51 +0530
Subject: [PATCH 1/3] To have screenshot even when its in afterhooks

---
 .../donut/transformers/cucumber/CucumberTransformer.scala       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala b/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
index 66e34ea..bfdfd3f 100644
--- a/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
+++ b/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
@@ -159,7 +159,7 @@ object CucumberTransformer extends Log {
   }
 
   private[cucumber] def donutScenarioScreenshots(e: Element) = {
-    val elementScreenshots: List[Embedding] = e.steps.flatMap(s => s.embeddings)
+    val elementScreenshots: List[Embedding] = e.steps.flatMap(s => if (s.embeddings == null) e.after.flatMap(t => if (t.embeddings==null) null else t.embeddings) else s.embeddings)
     val screenshotsSize = elementScreenshots.size
     val screenshotStyle = if (elementScreenshots.nonEmpty) "" else "display:none;"
     val screenshots = elementScreenshots.map(e => DonutEmbedding(e.mime_type, e.data, e.id))

From 0549549e4317d7c3c4636f5d46597c91c97aae37 Mon Sep 17 00:00:00 2001
From: jnernest <42038436+jnernest@users.noreply.github.com>
Date: Thu, 23 Jan 2020 11:14:02 +0530
Subject: [PATCH 2/3] Update CucumberModel.scala

---
 .../report/donut/transformers/cucumber/CucumberModel.scala    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/report/donut/transformers/cucumber/CucumberModel.scala b/src/main/scala/report/donut/transformers/cucumber/CucumberModel.scala
index 24c5f86..9aef848 100644
--- a/src/main/scala/report/donut/transformers/cucumber/CucumberModel.scala
+++ b/src/main/scala/report/donut/transformers/cucumber/CucumberModel.scala
@@ -10,7 +10,7 @@ case class Match(location: String = "", arguments: Option[List[Argument]])
 
 case class BeforeHook(result: Result, output: List[String], `match`: Match)
 
-case class AfterHook(result: Result, output: List[String], `match`: Match)
+case class AfterHook(result: Result, output: List[String], `match`: Match,embeddings: List[Embedding])
 
 case class Row(cells: List[String])
 
@@ -58,4 +58,4 @@ case class Feature(keyword: String,
   val scenariosExcludeBackground = {
     elements.filterNot(e => e.keyword == "Background")
   }
-}
\ No newline at end of file
+}

From 735d7eff8c20401ac0334c8da1e338d5632bc100 Mon Sep 17 00:00:00 2001
From: jnernest <42038436+jnernest@users.noreply.github.com>
Date: Mon, 27 Jan 2020 16:03:05 +0530
Subject: [PATCH 3/3] Update CucumberTransformer.scala

---
 .../donut/transformers/cucumber/CucumberTransformer.scala       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala b/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
index bfdfd3f..cbf8fb8 100644
--- a/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
+++ b/src/main/scala/report/donut/transformers/cucumber/CucumberTransformer.scala
@@ -159,7 +159,7 @@ object CucumberTransformer extends Log {
   }
 
   private[cucumber] def donutScenarioScreenshots(e: Element) = {
-    val elementScreenshots: List[Embedding] = e.steps.flatMap(s => if (s.embeddings == null) e.after.flatMap(t => if (t.embeddings==null) null else t.embeddings) else s.embeddings)
+        val elementScreenshots: List[Embedding] = e.after.flatMap(s => if (s.embeddings != Nil) s.embeddings else e.steps.flatMap(t => t.embeddings))
     val screenshotsSize = elementScreenshots.size
     val screenshotStyle = if (elementScreenshots.nonEmpty) "" else "display:none;"
     val screenshots = elementScreenshots.map(e => DonutEmbedding(e.mime_type, e.data, e.id))