Merge pull request #833 from Flaise/master

Support for mocha's 'qunit' interface
webdriverio · Oct 28, 2015 · 46f0120 · 46f0120
2 parents d1f5354 + 6639734
commit 46f0120
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/frameworks/mocha.js b/lib/frameworks/mocha.js
@@ -5,7 +5,8 @@ var q = require('q'),
     hasES6Support = require('../helpers/detectHarmony'),
     interfaces = {
         bdd: ['before', 'beforeEach', 'it', 'after', 'afterEach'],
-        tdd: ['suiteSetup', 'setup', 'test', 'suiteTeardown', 'teardown']
+        tdd: ['suiteSetup', 'setup', 'test', 'suiteTeardown', 'teardown'],
+        qunit: ['before', 'beforeEach', 'test', 'after', 'afterEach']
     };
 
 /**
@@ -18,7 +19,7 @@ module.exports.run = function(config, specs, capabilities) {
         requires = config.mochaOpts.require,
         runner;
 
-    if(typeof config.mochaOpts.ui !== 'string' || !config.mochaOpts.ui.match(/(bdd|tdd)/i)) {
+    if(typeof config.mochaOpts.ui !== 'string') {
         config.mochaOpts.ui = 'bdd';
     }
 
@@ -46,7 +47,7 @@ module.exports.run = function(config, specs, capabilities) {
     /**
      * enable generators if supported
      */
-    if(hasES6Support) {
+    if(hasES6Support && interfaces[config.mochaOpts.ui]) {
         mocha.suite.on('pre-require', function() {
             interfaces[config.mochaOpts.ui].forEach(runInGenerator.bind(null, config.mochaOpts.ui));
         });