wdio-allure-reporter: Bug fix where tests get unknown status and has …

…no execution information
webdriverio · Feb 18, 2020 · 47d14b3 · 47d14b3
1 parent c966686
commit 47d14b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/wdio-allure-reporter/src/index.js b/packages/wdio-allure-reporter/src/index.js
@@ -227,7 +227,7 @@ class AllureReporter extends WDIOReporter {
         }
 
         // add beforeEach / afterEach hook as step to test
-        if (this.options.disableMochaHooks && isMochaEachHooks(hook.title)) {
+        if (isMochaEachHooks(hook.title)) {
             if (this.allure.getCurrentTest()) {
                 this.allure.startStep(hook.title)
             }
@@ -245,12 +245,12 @@ class AllureReporter extends WDIOReporter {
 
     onHookEnd(hook) {
         // ignore global hooks
-        if (!hook.parent || !this.allure.getCurrentSuite() || (this.options.disableMochaHooks && !isMochaAllHooks(hook.title) && !this.allure.getCurrentTest())) {
+        if (!hook.parent || !this.allure.getCurrentSuite() || (!isMochaAllHooks(hook.title) && !this.allure.getCurrentTest())) {
             return false
         }
 
         // set beforeEach / afterEach hook (step) status
-        if (this.options.disableMochaHooks && isMochaEachHooks(hook.title)) {
+        if (isMochaEachHooks(hook.title)) {
             if (hook.error) {
                 this.allure.endStep(stepStatuses.FAILED)
             } else {

diff --git a/packages/wdio-allure-reporter/tests/allureFeatures.test.js b/packages/wdio-allure-reporter/tests/allureFeatures.test.js
@@ -525,20 +525,20 @@ describe('hooks handling default', () => {
         endStep = jest.fn(result => result)
     })
 
-    it('should capture mocha each hooks', () => {
+    it('should not capture mocha each hooks', () => {
         reporter.allure = allureInstance()
         reporter.onHookStart({ title: '"before each" hook', parent: 'foo' })
 
-        expect(startStep).toHaveBeenCalledTimes(0)
-        expect(startCase).toHaveBeenCalledTimes(1)
+        expect(startStep).toHaveBeenCalledTimes(1)
+        expect(startCase).toHaveBeenCalledTimes(0)
     })
 
-    it('should not ignore mocha each hooks if no test', () => {
+    it('should ignore mocha each hooks if no test', () => {
         reporter.allure = allureInstance({ test: null })
         reporter.onHookStart({ title: '"after each" hook', parent: 'foo' })
 
         expect(startStep).toHaveBeenCalledTimes(0)
-        expect(startCase).toHaveBeenCalledTimes(1)
+        expect(startCase).toHaveBeenCalledTimes(0)
     })
 
     it('should keep passed hooks if there are no steps (before/after)', () => {