[patch] add global hooks to child suites (#117)

Author: mmisty

src/plugins/allure-global-hook.ts

@@ -95,7 +95,7 @@ export class GlobalHooks {
   }
 
   attachment(name: string, file: string, type: ContentType) {
-    log(`add attachement: ${name}`);
+    log(`add attachment: ${name}`);
 
     if (!this.currentHook) {
       return;
@@ -106,7 +106,7 @@ export class GlobalHooks {
     }
     this.currentHook.attachments.push({ name, file, type });
 
-    log(`added attachement: ${name}`);
+    log(`added attachment: ${name}`);
   }
 
   // proces attachments

src/plugins/allure-reporter-plugin.ts

@@ -216,10 +216,10 @@ export class AllureReporter {
     return this.currentStep || this.currentHook || this.currentTest;
   }
 
-  addGlobalHooks(nestedLevel: number) {
+  addGlobalHooks(_nestedLevel: number) {
     log('>>> add Global Hooks');
 
-    if (nestedLevel > 1 || !this.globalHooks.hasHooks()) {
+    if (!this.globalHooks.hasHooks()) {
       log('not root hooks');
 
       return;
@@ -610,11 +610,7 @@ export class AllureReporter {
   }
 
   endGroup() {
-    // why >= 1?
-    if (this.groups.length >= 1) {
-      log('addGlobalHooks');
-      this.addGlobalHooks(this.groups.length);
-    }
+    this.addGlobalHooks(this.groups.length);
 
     if (this.currentGroup) {
       log('END GROUP');

tests/test-folder/mocha-events/suites/suites-nested-with-global-hooks-parent.test.ts

@@ -3,18 +3,26 @@ import { getParentsArray, parseAllure } from 'allure-js-parser';
 import { extname } from '../../../../src/common';
 import { readFileSync } from 'fs';
 
+// issue https://github.com/mmisty/cypress-allure-adapter/issues/95
 describe('several nested suites with global hook - hook should be added to all children', () => {
   const res = createResTest2([
     `
+before('glob hook', () => {
+  cy.log('before');
+});
+
 describe('hello suite', () => {
   before('parent hook', () => {
-    cy.allure().attachment('out parent', 'test number', 'text/plain');
+    cy.allure().attachment('out', 'test number', 'text/plain');
     cy.log('before');
   });
   
+  it('test 1', () => {
+    cy.log('message');
+  });
+  
   describe('child suite', () => {
     before('child hook', () => {
-      cy.allure().attachment('out child', 'test number', 'text/plain');
       cy.log('before');
     });
     
@@ -37,47 +45,56 @@ describe('hello suite', () => {
     });
 
     it('check tests count', async () => {
-      expect(resFixed.length).toEqual(1);
+      expect(resFixed.length).toEqual(2);
     });
 
     it('check tests names', async () => {
       expect(resFixed.map(t => t.fullName).sort()).toEqual([
         'hello suite child suite sub sub suite hello test',
+        'hello suite test 1',
       ]);
     });
 
     it('suites parents', () => {
       expect(
-        resFixed.map(t => ({
-          name: t.name,
-          status: t.status,
-          parents: getParentsArray(t).map(t => ({
+        resFixed
+          .sort((a, b) => (a.name < b.name ? -1 : 1))
+          .map(t => ({
             name: t.name,
-            befores: t.befores
-              ?.filter(x => (x as any).name !== '"before all" hook')
-              .map(x => ({
-                name: (x as any).name,
-                status: x.status,
-                attachments: x.attachments.map(t => ({
-                  ...t,
-                  source: `source${extname(t.source)}`,
-                  sourceContentMoreThanZero:
-                    readFileSync(`${res.watch}/${t.source}`).toString().length >
-                    0,
+            status: t.status,
+            parents: getParentsArray(t).map(t => ({
+              name: t.name,
+              befores: t.befores
+                ?.filter(x => (x as any).name !== '"before all" hook')
+                .map(x => ({
+                  name: (x as any).name,
+                  status: x.status,
+                  statusDetails: x.statusDetails,
+                  attachments: x.attachments.map(t => ({
+                    ...t,
+                    source: `source${extname(t.source)}`,
+                    sourceContentMoreThanZero:
+                      readFileSync(`${res.watch}/${t.source}`).toString()
+                        .length > 0,
+                  })),
                 })),
-              })),
+            })),
           })),
-        })),
       ).toEqual([
         {
           name: 'hello test',
           parents: [
             {
               befores: [
+                {
+                  name: '"before all" hook: glob hook',
+                  status: 'passed',
+                  attachments: [],
+                },
                 {
                   attachments: [
                     {
-                      name: 'out parent',
+                      name: 'out',
                       source: 'source.txt',
                       sourceContentMoreThanZero: true,
                       type: 'text/plain',
@@ -87,14 +104,7 @@ describe('hello suite', () => {
                   status: 'passed',
                 },
                 {
-                  attachments: [
-                    {
-                      name: 'out child',
-                      source: 'source.txt',
-                      sourceContentMoreThanZero: true,
-                      type: 'text/plain',
-                    },
-                  ],
+                  attachments: [],
                   name: '"before all" hook: child hook',
                   status: 'passed',
                 },
@@ -103,39 +113,75 @@ describe('hello suite', () => {
             },
             {
               befores: [
+                {
+                  attachments: [],
+                  name: '"before all" hook: glob hook',
+                  status: 'passed',
+                  statusDetails: {},
+                },
                 {
                   attachments: [
                     {
-                      name: 'out parent',
+                      name: 'out',
                       source: 'source.txt',
                       sourceContentMoreThanZero: true,
                       type: 'text/plain',
                     },
                   ],
                   name: '"before all" hook: parent hook',
                   status: 'passed',
+                  statusDetails: {},
+                },
+                {
+                  attachments: [],
+                  name: '"before all" hook: child hook',
+                  status: 'passed',
+                  statusDetails: {},
+                },
+              ],
+              name: 'child suite',
+            },
+            {
+              befores: [
+                {
+                  attachments: [],
+                  name: '"before all" hook: glob hook',
+                  status: 'passed',
+                  statusDetails: {},
                 },
                 {
                   attachments: [
                     {
-                      name: 'out child',
+                      name: 'out',
                       source: 'source.txt',
                       sourceContentMoreThanZero: true,
                       type: 'text/plain',
                     },
                   ],
-                  name: '"before all" hook: child hook',
+                  name: '"before all" hook: parent hook',
                   status: 'passed',
+                  statusDetails: {},
                 },
               ],
-              name: 'child suite',
+              name: 'hello suite',
             },
+          ],
+          status: 'passed',
+        },
+        {
+          name: 'test 1',
+          parents: [
             {
               befores: [
+                {
+                  attachments: [],
+                  name: '"before all" hook: glob hook',
+                  status: 'passed',
+                },
                 {
                   attachments: [
                     {
-                      name: 'out parent',
+                      name: 'out',
                       source: 'source.txt',
                       sourceContentMoreThanZero: true,
                       type: 'text/plain',