fix(testrunner): make .repeat() retain test order (#1814)

utils/testrunner/TestCollector.js

@@ -92,15 +92,48 @@ class Repeater {
   }
 
   createTestRuns(tests) {
-    const testRuns = [];
+    const suiteToChildren = new Map();
+    const rootSuites = new Set();
     for (const test of tests) {
-      let repeat = this._get(test);
+      let children = suiteToChildren.get(test.suite());
-      for (let suite = test.suite(); suite; suite = suite.parentSuite())
+      if (!children) {
-        repeat *= this._get(suite);
+        children = new Set();
-      for (let i = 0; i < repeat; i++)
+        suiteToChildren.set(test.suite(), children);
-        testRuns.push(new TestRun(test));
+      }
+      children.add(test);
+      for (let suite = test.suite(); suite; suite = suite.parentSuite()) {
+        let children = suiteToChildren.get(suite.parentSuite());
+        if (!children) {
+          children = new Set();
+          suiteToChildren.set(suite.parentSuite(), children);
+        }
+        children.add(suite);
+        // Add root suites.
+        if (!suite.parentSuite())
+          rootSuites.add(suite);
+      }
     }
-    return testRuns;
+
+    const collectTests = (testOrSuite) => {
+      const testOrder = [];
+      if (testOrSuite instanceof Test) {
+        testOrder.push(testOrSuite);
+      } else {
+        for (const child of suiteToChildren.get(testOrSuite))
+          testOrder.push(...collectTests(child));
+      }
+      const repeat = this._repeatCount.has(testOrSuite) ? this._repeatCount.get(testOrSuite) : 1;
+      const result = [];
+      for (let i = 0; i < repeat; ++i)
+        result.push(...testOrder);
+      return result;
+    }
+
+    const testOrder = [];
+    for (const rootSuite of rootSuites)
+      testOrder.push(...collectTests(rootSuite));
+    return testOrder.map(test => new TestRun(test));
+
   }
 }
 

utils/testrunner/test/testrunner.spec.js

@@ -516,6 +516,17 @@ module.exports.addTests = function({describe, fdescribe, xdescribe, it, xit, fit
       expect(beforeEach).toBe(6);
       expect(test).toBe(6);
     });
+    it('should repeat without breaking test order', async() => {
+      const t = new Runner();
+      const log = [];
+      t.describe.repeat(2)('suite', () => {
+        t.it('uno', () => log.push(1));
+        t.it.repeat(2)('dos', () => log.push(2));
+      });
+      t.it('tres', () => log.push(3));
+      await t.run();
+      expect(log.join()).toBe('1,2,2,1,2,2,3');
+    });
     it('should run tests if some fail', async() => {
       const t = new Runner();
       const log = [];