fix some merges

mochajs · Sep 18, 2016 · f28da97 · f28da97
1 parent 8aafc9a
commit f28da97
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/bin/_mocha b/bin/_mocha
@@ -105,7 +105,7 @@ program
   .option('--trace-deprecation', 'show stack traces on deprecations')
   .option('--use_strict', 'enforce strict mode')
   .option('--watch-extensions <ext>,...', 'additional extensions to monitor with --watch', list, [])
-  .option('--delay', 'wait for async suite definition');
+  .option('--delay', 'wait for async suite definition')
   .option('--generate-seed', 'generate a random seed and exit')
   .option('--random <seed>', 'randomize order of tests (with required random seed)');
 

diff --git a/lib/interfaces/qunit.js b/lib/interfaces/qunit.js
@@ -55,45 +55,41 @@ module.exports = function(suite) {
     };
 
     /**
-     * Do not randomize.
+     * Exclusive Suite.
      */
-    context.suite.inOrder = function(title) {
-      var suite = common.suite.create({
+    context.suite.only = function(title) {
+      if (suites.length > 1) {
+        suites.shift();
+      }
+      return common.suite.only({
         title: title,
-        file: file,
+        file: file
       });
-      suite.enableRandomize(false);
-      return suite;
     };
 
-    context.suite.only.inOrder =
-    context.suite.inOrder.only = function(title) {
-      var suite = common.suite.only({
+    /**
+     * Do not randomize.
+     */
+    context.suite.inOrder = function(title) {
+      var suite = common.suite.create({
         title: title,
-        file: file,
+        file: file
       });
       suite.enableRandomize(false);
       return suite;
     };
 
     /**
-     * Exclusive Suite.
+     * Do not randomize + exclusive
      */
-
-    context.suite.only = function(title) {
-      if (suites.length > 1) {
-        suites.shift();
-      }
-      return common.suite.only({
+    context.suite.only.inOrder = context.suite.inOrder.only = function(title) {
+      var suite = common.suite.only({
         title: title,
         file: file
       });
+      suite.enableRandomize(false);
+      return suite;
     };
-    context.suite.only.inOrder = context.suite.inOrder.only
-      = function(title, fn) {
-        var suite = context.suite.inOrder(title, fn);
-        mocha.grep(suite.fullTitle());
-      };
 
     /**
      * Describe a specification or test-case