From 9a5fd37668ae88ad557be9f6da989551e50c23e2 Mon Sep 17 00:00:00 2001 From: Luiz Vaz Date: Sun, 16 Aug 2020 17:52:56 -0300 Subject: [PATCH] Update DriverOptions.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🚀 Custom chrome options added. 🐞 Fixed a issue with workingDir that mistakenly create new directories when userDataDir was defined. --- .../intuit/karate/driver/DriverOptions.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java b/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java index 9470ecdda..cc5872d4c 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java @@ -81,6 +81,8 @@ public class DriverOptions { public final Logger driverLogger; public final String uniqueName; public final File workingDir; + public final boolean disableNotifications; + public final String userAgent; public final String userDataDir; public final String processLogFile; public final int maxPayloadSize; @@ -167,12 +169,20 @@ public DriverOptions(ScenarioContext context, Map options, LogAp args.add(executable); } } - workingDir = new File(FileUtils.getBuildDir() + File.separator + uniqueName); - if (options.containsKey("userDataDir")) { // special case allow user-specified null - userDataDir = (String) options.get("userDataDir"); + disableNotifications = get("disableNotifications", false); + userAgent = get("userAgent", null); + String place = get("userDataDir", null); + if (place != null) { // special case allow user-specified null + if (place.startsWith(".")){ + workingDir = new File((new File(place)).getAbsolutePath()); + } else{ + workingDir = new File(place); + } + userDataDir = workingDir.getAbsolutePath(); } else { + workingDir = new File(FileUtils.getBuildDir() + File.separator + uniqueName); userDataDir = workingDir.getAbsolutePath(); - } + } processLogFile = workingDir.getPath() + File.separator + type + ".log"; maxPayloadSize = get("maxPayloadSize", 4194304); target = get("target", null);