PR feedback

mochajs · Mar 10, 2021 · 080699f · 080699f
1 parent a945839
commit 080699f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/lib/mocha.js b/lib/mocha.js
@@ -137,10 +137,7 @@ exports.it.only = function(...args) {
   return (currentContext.it || currentContext.test).only.apply(this, args);
 };
 exports.it.skip = function(...args) {
-  return (
-    currentContext.xit ||
-    (currentContext.test && currentContext.test.skip)
-  ).apply(this, args);
+  return (currentContext.it || currentContext.test).skip.apply(this, args);
 };
 exports.xdescribe = exports.describe.skip;
 exports.xit = exports.it.skip;

diff --git a/test/integration/fixtures/common-js-require.fixture.js b/test/integration/fixtures/common-js-require.fixture.js
@@ -44,13 +44,13 @@ suite('root suite', () => {
   describe.only('describe only', () => {
     it('it', () => {
       console.log('running it');
-    });
+    }).timeout(1000);
     xit('it', () => {
       console.log('running xit');
     });
     it.only('it.only', () => {
       console.log('running it.only');
-    });
+    }).retries(2);
     it.skip('it.skip', () => {
       console.log('running it.skip');
     });

diff --git a/test/integration/fixtures/timeout-override-it.fixture.js b/test/integration/fixtures/timeout-override-it.fixture.js
diff --git a/test/integration/timeout.spec.js b/test/integration/timeout.spec.js
@@ -29,18 +29,4 @@ describe('this.timeout()', function() {
       done();
     });
   });
-
-  it('should allow using it().timeout()', function(done) {
-    run('timeout-override-it.fixture.js', args, function(err, res) {
-      if (err) {
-        done(err);
-        return;
-      }
-      assert.strictEqual(res.stats.pending, 0);
-      assert.strictEqual(res.stats.passes, 1);
-      assert.strictEqual(res.stats.failures, 0);
-      assert.strictEqual(res.code, 0);
-      done();
-    });
-  });
 });