actually fix safari alert issues

AmitKumar5 · Jul 23, 2013 · f5ce7d5 · f5ce7d5
1 parent 9ceb6eb
commit f5ce7d5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/app/ios.js b/app/ios.js
@@ -590,21 +590,6 @@ IOS.prototype.push = function(elem) {
   var me = this;
 
   var next = function() {
-    if (me.selectingNewPage && me.curWindowHandle) {
-      logger.info("We're in the middle of selecting a new page, " +
-                  "waiting to run next command until done");
-      setTimeout(next, 500);
-      return;
-    } else if (me.curWindowHandle && me.processingRemoteCmd &&
-               elem !== "au.alertIsPresent()" && elem !== "au.getAlertText()" &&
-               elem !== "au.acceptAlert()" && elem !== "au.dismissAlert()" &&
-               elem !== "au.setAlertText()" && elem !== "au.waitForAlertToClose") {
-      logger.info("We're in the middle of processing a remote debugger " +
-                  "command, waiting to run next command until done");
-      setTimeout(next, 500);
-      return;
-    }
-
     if (me.queue.length <= 0 || me.progress > 0) {
       return;
     }
@@ -613,6 +598,31 @@ IOS.prototype.push = function(elem) {
     , command = target[0]
     , cb = target[1];
 
+    if (me.selectingNewPage && me.curWindowHandle) {
+      logger.info("We're in the middle of selecting a new page, " +
+                  "waiting to run next command until done");
+      setTimeout(next, 500);
+      me.queue.unshift(target);
+      return;
+    } else if (me.curWindowHandle && me.processingRemoteCmd) {
+      var matches = ["au.alertIsPresent", "au.getAlertText", "au.acceptAlert",
+                     "au.dismissAlert", "au.setAlertText",
+                     "au.waitForAlertToClose"];
+      var matched = false;
+      _.each(matches, function(match) {
+        if (command.indexOf(match) === 0) {
+          matched = true;
+        }
+      });
+      if (!matched) {
+        logger.info("We're in the middle of processing a remote debugger " +
+                    "command, waiting to run next command until done");
+        setTimeout(next, 500);
+        me.queue.unshift(target);
+        return;
+      }
+    }
+
     me.cbForCurrentCmd = cb;
 
     me.progress++;

diff --git a/test/helpers/webview.js b/test/helpers/webview.js
@@ -720,7 +720,7 @@ module.exports.buildTests = function(webviewType) {
         });
       });
     });
-    it('should dismiss', function(done) {
+    it('should dismiss alert', function(done) {
       loadWebView(h.driver, function() {
         h.driver.elementById('alert1', function(err, link) {
           link.click(function(err) {