Merge pull request #3 from enhancv/callback-once

Execute callback only once
enhancv · Jun 8, 2017 · c3f9d4b · c3f9d4b
2 parents 73a7972 + 9b9bf45
commit c3f9d4b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/src/PopupTools.js b/src/PopupTools.js
@@ -138,13 +138,19 @@ function popupExecute(execute, url, name, options, callback) {
     var isMessageSent = false;
     var interval;
 
+    function popupCallbackOnce(err, data) {
+        if (!isMessageSent) {
+            isMessageSent = true;
+            popupCallback(err, data);
+        }
+    }
+
     function onMessage(message) {
         var data = message ? message.data : undefined;
 
         if (data) {
-            isMessageSent = true;
+            popupCallbackOnce(undefined, data);
             window.removeEventListener('message', onMessage);
-            popupCallback(undefined, data);
         }
     }
 
@@ -155,14 +161,12 @@ function popupExecute(execute, url, name, options, callback) {
             if (win == null || win.closed) {
                 setTimeout(function delayWindowClosing () {
                     clearInterval(interval);
-                    if (!isMessageSent) {
-                        popupCallback(new Error('Popup closed'));
-                    }
+                    popupCallbackOnce(new Error('Popup closed'));
                 }, 500);
             }
         }, 100);
     } else {
-        popupCallback(new Error('Popup blocked'));
+        popupCallbackOnce(new Error('Popup blocked'));
     }
 
     return win;

diff --git a/test/specs/centered.js b/test/specs/centered.js
@@ -31,6 +31,6 @@ describe('Centered', function () {
 
         browser.close();
 
-        assert.equal(browser.getText('#result'), 'Closed with Popup closed');
+        browser.waitUntil(() => browser.getText('#result') === 'Closed with Popup closed');
     }, 3);
 });
diff --git a/test/specs/dimensions.js b/test/specs/dimensions.js
@@ -31,6 +31,6 @@ describe('Dimensions', function () {
 
         browser.close();
 
-        assert.equal(browser.getText('#result'), 'Closed with Popup closed');
+        browser.waitUntil(() => browser.getText('#result') === 'Closed with Popup closed');
     }, 3);
 });
diff --git a/test/specs/position.js b/test/specs/position.js
@@ -31,6 +31,6 @@ describe('Position', function () {
 
         browser.close();
 
-        assert.equal(browser.getText('#result'), 'Closed with Popup closed');
+        browser.waitUntil(() => browser.getText('#result') === 'Closed with Popup closed');
     }, 3);
 });
diff --git a/test/specs/post.js b/test/specs/post.js
@@ -20,6 +20,6 @@ describe('Post', function () {
         assert.equal(browser.getText('h1'), '{"msg":"test post"}');
         browser.close();
 
-        assert.equal(browser.getText('#result'), 'Closed with Popup closed');
+        browser.waitUntil(() => browser.getText('#result') === 'Closed with Popup closed');
     }, 3);
 });
diff --git a/test/specs/response.js b/test/specs/response.js
@@ -25,6 +25,6 @@ describe('Response', function () {
             return !browser.getTabIds().includes(popupWindow);
         });
         browser.switchTab(baseWindow);
-        assert.equal(browser.getText('#result'), 'Data{"msg1":"Responded Successfully"}');
+        browser.waitUntil(() => browser.getText('#result') === 'Data{"msg1":"Responded Successfully"}');
     }, 3);
 });