Queue webdriver tests

niklasvh · May 18, 2014 · 73a3449 · 73a3449
1 parent ce1c4c8
commit 73a3449
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/tests/selenium.js b/tests/selenium.js
@@ -193,6 +193,7 @@
     }
 
     function runWebDriver(cases) {
+        var availableBrowsers = new Bacon.Bus();
         var browsers = [
             {
                 browserName: "chrome",
@@ -228,10 +229,16 @@
                 version: "34"
             }
         ];
-        return Bacon.combineTemplate({
-            capabilities: Bacon.sequentially(1000, browsers),
+        var result = Bacon.combineTemplate({
+            capabilities: Bacon.fromArray(browsers).zip(availableBrowsers.take(browsers.length), function(first) { return first; }),
             cases: cases
-        }).flatMap(webdriverStream);
+        }).flatMap(webdriverStream).doAction(function() {
+            availableBrowsers.push("ready");
+        });
+
+        Bacon.fromArray([1, 2, 3, 4]).onValue(availableBrowsers.push);
+
+        return result.fold([], pushToArray);
     }
 
     exports.tests = function() {