feature(): enable folderNames in name template

zalando · Dec 9, 2019 · 7c5a644 · 7c5a644
1 parent d04b227
commit 7c5a644
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/de/zalando/ep/zalenium/dashboard/TestInformation.java b/src/main/java/de/zalando/ep/zalenium/dashboard/TestInformation.java
@@ -219,7 +219,7 @@ public void buildVideoFileName() {
                 .replace("{platform}", this.platform)
                 .replace("{timestamp}", commonProxyUtilities.getDateAndTimeFormatted(this.timestamp))
                 .replace("{testStatus}", getTestStatus().toString())
-                .replaceAll("[^a-zA-Z0-9]", "_");
+                .replaceAll("[^a-zA-Z0-9/\\-]", "_");
 
         this.fileName = FILE_NAME_TEMPLATE.replace("{fileName}", testNameNoExtension)
                 .replace("{fileExtension}", fileExtension);

diff --git a/src/main/java/de/zalando/ep/zalenium/proxy/DockerSeleniumRemoteProxy.java b/src/main/java/de/zalando/ep/zalenium/proxy/DockerSeleniumRemoteProxy.java
@@ -638,8 +638,8 @@ void copyVideos(final String containerId) {
                 testInformation.setFileExtension(fileExtension);
                 Path videoFile = Paths.get(String.format("%s/%s", testInformation.getVideoFolderPath(),
                         testInformation.getFileName()));
-                if (!Files.exists(Paths.get(testInformation.getVideoFolderPath()))) {
-                    Files.createDirectories(Paths.get(testInformation.getVideoFolderPath()));
+                if (!Files.exists(videoFile.getParent())) {
+                    Files.createDirectories(videoFile.getParent());
                 }
                 Files.copy(tarStream, videoFile);
                 CommonProxyUtilities.setFilePermissions(videoFile);