better titles for mocha hooks (fixes allure-framework#424, via allure…

…-framework#510)
vovsemenv · Oct 28, 2022 · cbb3426 · cbb3426
1 parent 4122761
commit cbb3426
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/allure-mocha/src/AllureReporter.ts b/packages/allure-mocha/src/AllureReporter.ts
@@ -64,14 +64,15 @@ export class AllureReporter {
   public startHook(hook: Mocha.Hook): void {
     const suite: AllureGroup | null = this.currentSuite;
     const title = hook.title;
+
     if (suite && title && title.includes("before")) {
       this.currentExecutable = suite.addBefore();
     } else if (suite && title && title.includes("after")) {
       this.currentExecutable = suite.addAfter();
     }
 
     if (this.currentExecutable) {
-      this.currentExecutable.name = hook.originalTitle || hook.title;
+      this.currentExecutable.name = title;
     }
   }
 

diff --git a/packages/allure-mocha/src/MochaAllureReporter.ts b/packages/allure-mocha/src/MochaAllureReporter.ts
@@ -81,6 +81,6 @@ export class MochaAllureReporter extends Mocha.reporters.Base {
   }
 
   private onHookEnd(hook: Mocha.Hook): void {
-    this.coreReporter.endHook(hook.error());
+    this.coreReporter.endHook(hook?.error?.());
   }
 }
diff --git a/packages/allure-mocha/test/specs/hooks.ts b/packages/allure-mocha/test/specs/hooks.ts
@@ -75,7 +75,7 @@ class HooksSuite {
 
     const [beforeHook] = group.befores;
 
-    expect(beforeHook.name).eq('"before each" hook: some beforeEach name');
+    expect(beforeHook.name).eq('"before each" hook: some beforeEach name for "named hooks test"');
   }
 
   @test
@@ -84,6 +84,6 @@ class HooksSuite {
 
     const [afterEach] = group.afters;
 
-    expect(afterEach.name).eq('"after each" hook: some afterEach name');
+    expect(afterEach.name).eq('"after each" hook: some afterEach name for "named hooks test"');
   }
 }