fix: transform suite into child suite

Author: KuznetsovRoman

lib/tests-tree-builder/base.ts

@@ -160,14 +160,17 @@ export class BaseTestsTreeBuilder {
                 const suite: TreeSuite = {id, parentId, name, suitePath, root: isRoot};
 
                 this._addSuite(suite);
-            } else if (!isRoot && suites.byId[id].root) {
+            } else if (suitePath.length > suites.byId[id].suitePath.length) {
                 const newParentId = this._buildId(suitePath.slice(0, -1));
 
-                suites.byId[id].root = false;
                 suites.byId[id].parentId = newParentId;
                 suites.byId[id].suitePath = suitePath;
-                suites.byId[id].name = suites.byId[id].name.slice(newParentId.length + 1);
-                suites.allRootIds.splice(suites.allRootIds.indexOf(id), 1);
+                suites.byId[id].name = suites.byId[id].id.slice(newParentId.length + 1);
+
+                if (suites.byId[id].root) {
+                    suites.byId[id].root = false;
+                    suites.allRootIds.splice(suites.allRootIds.indexOf(id), 1);
+                }
             }
 
             if (ind !== arr.length - 1) {

test/unit/lib/tests-tree-builder/base.js

@@ -109,7 +109,7 @@ describe('ResultsTreeBuilder', () => {
                 );
             });
 
-            it('should transform root suite into child suite', () => {
+            it('should transform root suite into non-root suite', () => {
                 builder.addTestResult(mkFormattedResult_({testPath: ['s1 s2', 's3']}));
 
                 assert.deepEqual(
@@ -140,6 +140,56 @@ describe('ResultsTreeBuilder', () => {
                     }
                 );
             });
+
+            it('should transform suite into child suite', () => {
+                builder.addTestResult(mkFormattedResult_({testPath: ['s1', 's2 s3', 's4']}));
+
+                assert.deepEqual(
+                    builder.tree.suites.byId['s1 s2 s3'],
+                    {
+                        id: 's1 s2 s3',
+                        name: 's2 s3',
+                        parentId: 's1',
+                        root: false,
+                        suitePath: ['s1', 's2 s3'],
+                        status: SUCCESS,
+                        suiteIds: ['s1 s2 s3 s4']
+                    }
+                );
+
+                builder.addTestResult(mkFormattedResult_({testPath: ['s1', 's2', 's3', 's5']}));
+
+                assert.deepEqual(
+                    builder.tree.suites.byId['s1 s2 s3'],
+                    {
+                        id: 's1 s2 s3',
+                        name: 's3',
+                        parentId: 's1 s2',
+                        root: false,
+                        suitePath: ['s1', 's2', 's3'],
+                        status: SUCCESS,
+                        suiteIds: ['s1 s2 s3 s4', 's1 s2 s3 s5']
+                    }
+                );
+            });
+
+            it('should merge suite into existing one', () => {
+                builder.addTestResult(mkFormattedResult_({testPath: ['s1', 's2', 's3', 's4']}));
+                builder.addTestResult(mkFormattedResult_({testPath: ['s1', 's2 s3', 's5']}));
+
+                assert.deepEqual(
+                    builder.tree.suites.byId['s1 s2 s3'],
+                    {
+                        id: 's1 s2 s3',
+                        name: 's3',
+                        parentId: 's1 s2',
+                        root: false,
+                        suitePath: ['s1', 's2', 's3'],
+                        status: SUCCESS,
+                        suiteIds: ['s1 s2 s3 s4', 's1 s2 s3 s5']
+                    }
+                );
+            });
         });
 
         describe('"browsers" field in the tree', () => {