switching to dj-selenium to temp handle selenium bug SeleniumHQ/selenium#378 and some code cleanup

Author: scott2449

.jshintrc

@@ -6,6 +6,6 @@
   "unused":    false,
   "indent":    2,
   "maxcomplexity": 3,
-  "maxparams": 4,
+  "maxparams": 3,
   "maxdepth": 2
 }

lib/fiveby.js

@@ -1,5 +1,5 @@
 /* global promise, run */
-var webdriver = require('selenium-webdriver');
+var webdriver = require('dj-webdriver');
 var Hook = require('mocha').Hook;
 var tb = require('traceback');
 var LogManager = require('./logManager');
@@ -38,7 +38,7 @@ fiveby.prototype.localServer = function () {
 
 fiveby.prototype.runSeleniumServer = function () {
   console.info('spinning up local server ...');
-  var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
+  var SeleniumServer = require('dj-webdriver/remote').SeleniumServer;
   var server = new SeleniumServer(Helper.getLocation(), { port: 4444 });
   server.start();
   global.fivebyConfig.hubUrl = this.config.hubUrl = server.address();
@@ -91,27 +91,24 @@ fiveby.prototype.runSuiteInBrowsers = function (test) {
       }
       self.logManager.setAdditionalLogOptions(capabilities);
 
-      //setup post driver step
-      var promo = function () {
-        var describe = test(driver);
+      //build driver
+      var driver = new webdriver.Builder()
+        .usingServer(self.config.hubUrl)
+        .withCapabilities(capabilities)
+        .build();
+      driver.name = elem;
+      driver.manage().timeouts().implicitlyWait(self.config.implicitWait);
 
-        //register hooks with mocha
-        self.registerHook('fiveby error handling', describe, 'beforeEach', function () {
-          this.currentTest.parent.file = this.currentTest.file = file; //correct file name bug with async execution and mocha
-          webdriver.promise.controlFlow().on('uncaughtException', function (e) { //map errors to test when appropriate
-            if (this.currentTest) {
-              this.currentTest.callback(e);
-            } else {
-              console.error('Failed in setup or teardown, test result may not be valid for this file'); //failed in non-test
-              throw(e);
-            }
-          });
-        });
+      //hook and execute tests
+      webdriver.promise.controlFlow().execute(function () {
+        var describe = test(driver);
 
-        self.registerHook('fiveby cleanup', describe, 'afterAll', function () {
+        self.registerHook(describe, 'afterAll-first', function () {
           testComplete.fulfill();
           self.logManager.onAfterHook(driver);
+        });
 
+        self.registerHook(describe, 'afterAll-last', function () {
           if (driver.session_) { //in case the tests already killed the session
             return driver.quit();
           }
@@ -120,35 +117,32 @@ fiveby.prototype.runSuiteInBrowsers = function (test) {
         run();
 
         return webdriver.promise.fulfilled();
-      };
-
-      //build driver
-      var driver = new webdriver.Builder()
-        .usingServer(self.config.hubUrl)
-        .withCapabilities(capabilities)
-        .build();
-      driver.name = elem;
-      driver.manage().timeouts().implicitlyWait(self.config.implicitWait);
-
-      webdriver.promise.controlFlow().execute(promo);
+      });
 
     });
   });
 };
 
-fiveby.prototype.registerHook = function (name, suite, hookarr, func) {
-  var hook = new Hook(name, func);
+fiveby.prototype.registerHook = function (suite, pos, func) {
+  var hook = new Hook('fiveby '+pos+' hook', func);
+
+  pos = pos.split('-');
+  var key = pos[0];
+  var loc = pos[1];
+
   hook.parent = suite;
   if (suite && suite.ctx) {
     hook.ctx = suite.ctx;
   } else {
     console.error('ERROR: Please return test suite (describe) in the fiveby constructor callback.');
     return process.exit(2);
   }
+
   hook.timeout(5000);
-  if (hookarr.indexOf('before') > -1) {
-    suite['_' + hookarr].unshift(hook);
+
+  if (loc === 'first') {
+    suite['_' + key].unshift(hook);
   } else {
-    suite['_' + hookarr].push(hook);
+    suite['_' + key].push(hook);
   }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiveby",
-  "version": "2.0.0-beta2",
+  "version": "2.0.0-beta.3",
   "description": "Package up testing options, levels, apis, and dependencies into one simple lib",
   "scripts": {
     "test": "gulp test"

test/fiveby.js

@@ -182,14 +182,14 @@ describe('fiveby hooks', function () {
 
   it('before', function () {
     var arr = ['mark'];
-    fb.registerHook('derper', {ctx:'yup', '_before': arr}, 'before', function () {});
+    fb.registerHook({ctx:'yup', '_before': arr}, 'before-first', function () {});
     arr.length.should.equal(2);
     arr[1].should.equal('mark');
   });
 
   it('after', function () {
     var arr = ['mark'];
-    fb.registerHook('derper', {ctx:'yup', '_after': arr}, 'after', function () {});
+    fb.registerHook({ctx:'yup', '_after': arr}, 'after-last', function () {});
     arr.length.should.equal(2);
     arr[0].should.equal('mark');
   });
@@ -199,7 +199,7 @@ describe('fiveby hooks', function () {
       code.should.equal(2);
       done();
     };
-    fb.registerHook('derper', {'_after': []}, 'after', function () {});
+    fb.registerHook({'_after': []}, 'after-first', function () {});
   });
 
 });
@@ -224,7 +224,7 @@ describe('fiveby local server', function () {
       }
     };
 
-    var fiveby = proxyquire('../lib/fiveby', { 'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', { 'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({browsers:{}});
     return fb.localServer().then(function () {
       count.should.equal(1);
@@ -250,7 +250,7 @@ describe('fiveby local server', function () {
       }
     };
 
-    var fiveby = proxyquire('../lib/fiveby', { 'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', { 'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({browsers:{}});
     global.fivebyConfig.hubUrl='http://sample.stuff.xyz';
     global.serverPromise = null;
@@ -278,7 +278,7 @@ describe('fiveby local server', function () {
       }
     };
 
-    var fiveby = proxyquire('../lib/fiveby', { 'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', { 'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({browsers:{}});
     global.serverPromise = promise.fulfilled();
     return fb.localServer().then(function () {
@@ -299,7 +299,7 @@ describe('runSuiteInBrowsers', function () {
   };
 
   it('bad browser name', function (done) {
-    var fiveby = proxyquire('../lib/fiveby', {'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', {'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({browsers:{shmul:1}});
     console.warn = function (msg, browser) {
       msg.should.equal('No such browser: %s');
@@ -310,7 +310,7 @@ describe('runSuiteInBrowsers', function () {
   });
 
   it('no browsers provided', function (done) {
-    var fiveby = proxyquire('../lib/fiveby', {'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', {'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({});
     console.warn = function (msg) {
       msg.should.equal('No browsers provided, must provide at least one');
@@ -320,22 +320,22 @@ describe('runSuiteInBrowsers', function () {
   });
 
   it('browser 0 arg bail', function () {
-    var fiveby = proxyquire('../lib/fiveby', {'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub});
+    var fiveby = proxyquire('../lib/fiveby', {'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub});
     var fb = new fiveby({browsers:{chrome:1}});
     fb.runSuiteInBrowsers(function () {});
   });
 
   it('exercise', function () {
-    var fiveby = proxyquire('../lib/fiveby', { 'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub, 'selenium-webdriver': webDriverStub});
+    var fiveby = proxyquire('../lib/fiveby', { 'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub, 'dj-webdriver': webDriverStub});
     var fb = new fiveby({browsers:{chrome:{'chromeOptions': {'args': ['--disable-extensions']}}, ie: 1}});
-    fb.registerHook = function (name, suite, hookarr, func) {
+    fb.registerHook = function (suite, hookarr, func) {
       func.apply({currentTest:{parent:{}}});
     };
     fb.runSuiteInBrowsers(function (b) {});
   });
 
   it('exercise alt', function () { //refactor anyone =)
-    var fiveby = proxyquire('../lib/fiveby', { 'selenium-webdriver/remote': webDriverStubRemote, './helper': helperStub, 'selenium-webdriver': webDriverStubFail});
+    var fiveby = proxyquire('../lib/fiveby', { 'dj-webdriver/remote': webDriverStubRemote, './helper': helperStub, 'dj-webdriver': webDriverStubFail});
     var fb = new fiveby({browsers:{chrome:{'chromeOptions': {'args': ['--disable-extensions']}}, ie: 1}});
     promise.controlFlow = function () {
       return {
@@ -351,7 +351,7 @@ describe('runSuiteInBrowsers', function () {
         }
       };
     };
-    fb.registerHook = function (name, suite, hookarr, func) {
+    fb.registerHook = function (suite, hookarr, func) {
       func.apply({currentTest:{parent:{}}});
     };
     fb.runSuiteInBrowsers(function (b) {});

test/logManager.js

@@ -1,6 +1,6 @@
 /* global describe, it, before, assert, promise */
 var proxyquire = require('proxyquire').noPreserveCache();
-var webdriver = require('selenium-webdriver');
+var webdriver = require('dj-webdriver');
 
 var fsStub = {
   existsSync: function () {