fix(html): support multiple videos in test page (#973)

MarathonLabs · Sep 23, 2024 · 4e765c7 · 4e765c7
1 parent 9befce5
commit 4e765c7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/report/html/HtmlSummaryReporter.kt b/core/src/main/kotlin/com/malinskiy/marathon/report/html/HtmlSummaryReporter.kt
@@ -8,6 +8,7 @@ import com.malinskiy.marathon.config.Configuration
 import com.malinskiy.marathon.device.DeviceFeature
 import com.malinskiy.marathon.device.DeviceInfo
 import com.malinskiy.marathon.device.DevicePoolId
+import com.malinskiy.marathon.execution.AttachmentType
 import com.malinskiy.marathon.execution.TestResult
 import com.malinskiy.marathon.execution.TestStatus
 import com.malinskiy.marathon.extension.escape
@@ -175,14 +176,10 @@ class HtmlSummaryReporter(
         }
     }
 
-    private fun TestResult.receiveVideoPath(poolId: String, batchId: String): String {
-        val videoRelativePath =
-            fileManager.createFile(FileType.VIDEO, DevicePoolId(poolId), device, test, batchId).relativePathTo(rootOutput)
-        val videoFullPath = File(rootOutput, videoRelativePath)
-        return when (device.deviceFeatures.contains(DeviceFeature.VIDEO) && videoFullPath.exists()) {
-            true -> "../../../../${videoRelativePath.replace("#", "%23")}"
-            false -> ""
-        }
+    private fun TestResult.receiveVideoPaths(poolId: String, batchId: String): List<String> {
+        if (!device.deviceFeatures.contains(DeviceFeature.VIDEO)) return emptyList()
+        return attachments.filter { it.type == AttachmentType.VIDEO && it.file.exists() }.map { it.file.relativePathTo(rootOutput) }
+            .map { "../../../../${it.replace("#","%23")}" }
     }
 
     private fun TestResult.receiveLogPath(poolId: String, batchId: String): String {
@@ -209,7 +206,7 @@ class HtmlSummaryReporter(
         diagnosticScreenshots = device.deviceFeatures.contains(DeviceFeature.SCREENSHOT),
         stacktrace = stacktrace,
         screenshot = receiveScreenshotPath(poolId, batchId),
-        video = receiveVideoPath(poolId, batchId),
+        videos = receiveVideoPaths(poolId, batchId),
         logFile = receiveLogPath(poolId, batchId)
     )
 

diff --git a/html-report/src/components/TestItem.js b/html-report/src/components/TestItem.js
@@ -38,9 +38,12 @@ export default class TestItem extends Component {
                         </div>
                     </div>
 
-                    {!!data.video && <div className='card row full'>
-                        <ReactPlayer url={data.video} controls={true} playsinline={true}/>
-                    </div>}
+                    <div className="container-expanded list">
+                    {data.videos.map((video, i) => {
+                        return (<div className='card row full'><ReactPlayer url={video} controls={true} playsinline={true}/></div>)
+                        })
+                    }
+                    </div>
 
                     {!!data.screenshot && <div className='card row full'>
                         <img src={data.screenshot}/>

diff --git a/report/html-report/src/main/kotlin/com/malinskiy/marathon/report/HtmlFullTest.kt b/report/html-report/src/main/kotlin/com/malinskiy/marathon/report/HtmlFullTest.kt
@@ -16,6 +16,6 @@ data class HtmlFullTest(
     @SerializedName("diagnostic_video") val diagnosticVideo: Boolean,
     @SerializedName("diagnostic_screenshots") val diagnosticScreenshots: Boolean,
     @SerializedName("screenshot") val screenshot: String,
-    @SerializedName("video") val video: String,
+    @SerializedName("videos") val videos: List<String>,
     @SerializedName("log_file") val logFile: String,
 )
diff --git a/report/html-report/src/main/resources/html-report/app.min.js b/report/html-report/src/main/resources/html-report/app.min.js