make forbidOnly option throw exception even if suite is excluded by grep

mochajs · Jun 2, 2020 · a223e2c · a223e2c
1 parent 4b976f5
commit a223e2c
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/interfaces/common.js b/lib/interfaces/common.js
@@ -94,6 +94,9 @@ module.exports = function(suites, context, mocha) {
        * @returns {Suite}
        */
       only: function only(opts) {
+        if (mocha.options.forbidOnly) {
+          throw createForbiddenExclusivityError(mocha);
+        }
         opts.isOnly = true;
         return this.create(opts);
       },
@@ -130,12 +133,14 @@ module.exports = function(suites, context, mocha) {
           if (mocha.options.forbidOnly && shouldBeTested(suite)) {
             throw createForbiddenExclusivityError(mocha);
           }
-          suite.parent.appendOnlySuite(suite);
+          suite.markOnly();
         }
-        if (suite.pending) {
-          if (mocha.options.forbidPending && shouldBeTested(suite)) {
-            throw createUnsupportedError('Pending test forbidden');
-          }
+        if (
+          suite.pending &&
+          mocha.options.forbidPending &&
+          shouldBeTested(suite)
+        ) {
+          throw createUnsupportedError('Pending test forbidden');
         }
         if (typeof opts.fn === 'function') {
           opts.fn.call(suite);