implemented sync method for multibrowser #nextLevelShit

richardmcsong · Jun 24, 2015 · 6d4221d · 6d4221d
1 parent 84197a8
commit 6d4221d
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 14 deletions.
diff --git a/index.js b/index.js
@@ -57,13 +57,14 @@ var remote = module.exports.remote = function remote(options, modifier) {
 };
 
 module.exports.multiremote = function multiremote(options) {
-    var clients = {},
-        multibrowser;
+    var multibrowser = new Multibrowser();
 
     Object.keys(options).forEach(function(browserName) {
-        clients[browserName] = remote(options[browserName]);
+        multibrowser.addInstance(
+            browserName,
+            remote(options[browserName], multibrowser.getInstanceModifier())
+        );
     });
 
-    multibrowser = remote(options, Multibrowser(clients));
-    return multibrowser;
-}
+    return remote(options, multibrowser.getModifier());
+};
diff --git a/lib/multibrowser.js b/lib/multibrowser.js
@@ -4,10 +4,25 @@ var q = require('q');
  * Constructor
  */
 function Multibrowser(instances) {
-    var browserNames = Object.keys(instances);
+    this.instances = {};
+    this.promiseBucket = [];
+}
 
-    return function modifier(client) {
+Multibrowser.prototype.addInstance = function(browserName, client) {
+    if(this.instances[browserName]) {
+        throw new Error('webdriver instance "' + browserName + '" is already defined');
+    }
+    this.instances[browserName] = client;
+}
 
+/**
+ * modifier for multibrowser instance
+ */
+Multibrowser.prototype.getModifier = function() {
+    var browserNames = Object.keys(this.instances),
+        multibrowser = this;
+
+    return function(client) {
         client.next = function() {
             var self = this,
                 promises = [],
@@ -20,9 +35,14 @@ function Multibrowser(instances) {
              */
             args.shift();
 
+            /**
+             * flush promise bucket
+             */
+            multibrowser.promiseBucket = [];
+
             return this.lastPromise.done(function() {
                 browserNames.forEach(function(browserName) {
-                    instance = instances[browserName];
+                    instance = multibrowser.instances[browserName];
                     instance = instance[fnName].apply(instance, args[0]);
                     promises.push(instance.promise);
                 });
@@ -35,15 +55,61 @@ function Multibrowser(instances) {
         };
 
         client.select = function(browserName) {
-            if(browserNames.indexOf(browserName) === -1) {
-                throw new Error('browser name ' + browserName + ' was not defined');
+            var instance = multibrowser.instances[browserName];
+
+            if(!instance) {
+                throw new Error('browser name "' + browserName + '" was not defined');
             }
-            return instances[browserName];
+
+            instance.isMultibrowser = false;
+            return instance;
         };
 
-        return client;
+        client.sync = function() {
+            var bucket = multibrowser.flushPromiseBucket();
+
+            return this.call(function() {
+                return q.all(bucket);
+            });
+
+        };
 
+        return client;
     };
-}
+};
+
+/**
+ * flush bucket and return current pending promises
+ */
+Multibrowser.prototype.flushPromiseBucket = function() {
+    var bucket = this.promiseBucket.filter(function(promise) {
+        return promise.inspect().state === 'pending';
+    });
+    this.promiseBucket = [];
+    return bucket;
+};
+
+/**
+ * modifier for single webdriverio instances
+ */
+Multibrowser.prototype.getInstanceModifier = function() {
+    var multibrowser = this;
+
+    return function(client) {
+        var _next = client.next;
+
+        /**
+         * Overwrite next (bind) method to put each command into a bucket.
+         * This provides us useful information about all current running
+         * commands.
+         */
+        client.next = function() {
+            multibrowser.promiseBucket.push(this.promise);
+            return _next.apply(this, arguments);
+        }
+
+        return client;
+    }
+};
 
 module.exports = Multibrowser;