Merge pull request #1259 from luizvaz/develop

Fixed a issue with messages getting missed by wait.send method.
karatelabs · Aug 18, 2020 · 9a3d926 · 9a3d926
2 parents a570297 + 802a004
commit 9a3d926
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java
@@ -94,7 +94,7 @@ protected DevToolsDriver(DriverOptions options, Command command, String webSocke
         logger = options.driverLogger;
         this.options = options;
         this.command = command;
-        this.wait = new DevToolsWait(options);
+        this.wait = new DevToolsWait(this, options);
         int pos = webSocketUrl.lastIndexOf('/');
         rootFrameId = webSocketUrl.substring(pos + 1);
         logger.debug("root frame id: {}", rootFrameId);
@@ -150,12 +150,12 @@ public void send(DevToolsMessage dtm) {
     }
 
     public DevToolsMessage sendAndWait(DevToolsMessage dtm, Predicate<DevToolsMessage> condition) {
-        send(dtm);
         boolean wasSubmit = submit;
         if (condition == null && submit) {
             submit = false;
             condition = DevToolsWait.ALL_FRAMES_LOADED;
         }
+        //Do stuff inside wait to avoid missing messages
         DevToolsMessage result = wait.send(dtm, condition);
         if (result == null && !wasSubmit) {
             throw new RuntimeException("failed to get reply for: " + dtm);

diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsWait.java b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsWait.java
@@ -33,6 +33,7 @@
 public class DevToolsWait {
 
     private final DriverOptions options;
+    private final DevToolsDriver driver;
 
     private DevToolsMessage lastSent;
     private Predicate<DevToolsMessage> condition;
@@ -73,7 +74,8 @@ public static Predicate<DevToolsMessage> forEvent(String name) {
         return m -> name.equals(m.getMethod());
     }
 
-    public DevToolsWait(DriverOptions options) {
+    public DevToolsWait(DevToolsDriver driver, DriverOptions options) {
+        this.driver = driver;
         this.options = options;
         logger = options.driverLogger;
     }
@@ -97,6 +99,7 @@ public DevToolsMessage send(DevToolsMessage dtm, Predicate<DevToolsMessage> cond
         synchronized (this) {
             logger.trace(">> wait: {}", dtm);
             try {
+                driver.send(dtm);
                 wait(timeout);
             } catch (InterruptedException e) {
                 logger.error("interrupted: {} wait: {}", e.getMessage(), dtm);