fix(runner): Ensure inner suite { sequential: true } correctly overri…

…des outer suite { concurrent: true } (#5737)
vitest-dev · May 17, 2024 · a20e75b · a20e75b
1 parent 1ec61ce
commit a20e75b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/runner/src/suite.ts b/packages/runner/src/suite.ts
@@ -286,9 +286,11 @@ function createSuite() {
     if (currentSuite?.options)
       options = { ...currentSuite.options, ...options }
 
-    // inherit concurrent / sequential from current suite
-    options.concurrent = this.concurrent || (!this.sequential && options?.concurrent)
-    options.sequential = this.sequential || (!this.concurrent && options?.sequential)
+    // inherit concurrent / sequential from suite
+    const isConcurrent = options.concurrent || (this.concurrent && !this.sequential)
+    const isSequential = options.sequential || (this.sequential && !this.concurrent)
+    options.concurrent = isConcurrent && !isSequential
+    options.sequential = isSequential && !isConcurrent
 
     return createSuiteCollector(formatName(name), factory, mode, this.shuffle, this.each, options)
   }

diff --git a/test/core/test/concurrent-suite.test.ts b/test/core/test/concurrent-suite.test.ts
@@ -119,10 +119,9 @@ describe('override concurrent', { concurrent: true }, () => {
     checkSequentialTests()
   })
 
-  // TODO: not working?
-  // describe('s-x-2', { sequential: true, }, () => {
-  //   checkSequentialTests()
-  // })
+  describe('s-x-2', { sequential: true }, () => {
+    checkSequentialTests()
+  })
 
   describe('s-y', () => {
     checkParallelTests()