test(transactions): skip nested suite if parent suite skipped

Re: #6754
Automattic · Jul 29, 2018 · e91d404 · e91d404
1 parent 22c6c33
commit e91d404
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/test/docs/transactions.test.js b/test/docs/transactions.test.js
@@ -8,6 +8,7 @@ const Schema = mongoose.Schema;
 
 describe('transactions', function() {
   let db;
+  let _skipped = false;
 
   before(function() {
     db = start({ replicaSet: 'rs' });
@@ -16,6 +17,7 @@ describe('transactions', function() {
       then(() => {
         // Skip if not a repl set
         if (db.client.topology.constructor.name !== 'ReplSet') {
+          _skipped = true;
           this.skip();
         }
       }).
@@ -29,11 +31,13 @@ describe('transactions', function() {
       })).
       then(version => {
         if (version[0] < 4) {
+          _skipped = true;
           this.skip();
         }
       }).
       catch(() => {
-        this.skip()
+        _skipped = true;
+        this.skip();
       });
   });
 
@@ -155,17 +159,26 @@ describe('transactions', function() {
     });
 
     beforeEach(function() {
+      if (_skipped) {
+        return this.skip(); // https://github.com/mochajs/mocha/issues/2546
+      }
       return Author.deleteMany({}).then(() => Article.deleteMany({}));
     });
 
     beforeEach(function() {
+      if (_skipped) {
+        return this.skip(); // https://github.com/mochajs/mocha/issues/2546
+      }
       return db.startSession().then(_session => {
         session = _session;
         session.startTransaction();
       });
     });
 
     afterEach(function() {
+      if (_skipped) {
+        return; // https://github.com/mochajs/mocha/issues/2546
+      }
       return session.commitTransaction();
     });