@@ -14,7 +14,8 @@ import {
1414import getUuid from 'uuid-by-string' ;
1515import getUuidByString from 'uuid-by-string' ;
1616import { parseAllure } from 'allure-js-parser' ;
17- import { copyFileSync , existsSync , mkdirSync , readFile , readFileSync , writeFileSync } from 'fs' ;
17+ import { copyFileSync , existsSync , mkdirSync , readFileSync , writeFileSync } from 'fs' ;
18+ import { readFile } from 'fs/promises' ;
1819import path , { basename } from 'path' ;
1920import glob from 'fast-glob' ;
2021import { ReporterOptions } from './allure' ;
@@ -24,14 +25,7 @@ import { AllureTaskArgs, LabelName, Stage, StatusType, UNKNOWN } from './allure-
2425import { extname , packageLog } from '../common' ;
2526import type { ContentType } from '../common/types' ;
2627import { randomUUID } from 'crypto' ;
27- import {
28- copyAttachments ,
29- copyFileCp ,
30- copyTest ,
31- mkdirSyncWithTry ,
32- waitWhileCondition ,
33- writeResultFile ,
34- } from './fs-tools' ;
28+ import { copyAttachments , copyFileCp , copyTest , mkdirSyncWithTry , writeResultFile } from './fs-tools' ;
3529
3630const beforeEachHookName = '"before each" hook' ;
3731const beforeAllHookName = '"before all" hook' ;
@@ -41,11 +35,9 @@ const isBeforeEachHook = (ttl: string | undefined) => ttl?.indexOf(beforeEachHoo
4135const isAfterEachHook = ( ttl : string | undefined ) => ttl ?. indexOf ( afterEachHookName ) !== - 1 ;
4236const isBeforeAllHook = ( ttl : string | undefined ) => ttl ?. indexOf ( beforeAllHookName ) !== - 1 ;
4337
44- const debug = Debug ( 'cypress-allure:reporter' ) ;
38+ const log = Debug ( 'cypress-allure:reporter' ) ;
4539
46- const log = ( ...args : unknown [ ] ) => {
47- debug ( args ) ;
48- } ;
40+ const allTasks : any [ ] = [ ] ;
4941
5042const createNewContentForContainer = ( nameAttAhc : string , existingContents : Buffer , ext : string , specname : string ) => {
5143 const getContentJson = ( ) => {
@@ -93,15 +85,15 @@ const createNewContentForContainer = (nameAttAhc: string, existingContents: Buff
9385 * @param input
9486 * @param allureResultsWatch
9587 */
96- const copyFileToWatch = async (
88+ const copyFileToWatch = (
9789 input : { test : string ; attachments : { name : string ; type : string ; source : string } [ ] } ,
9890 allureResultsWatch : string ,
9991) => {
10092 const { test : allureResultFile , attachments } = input ;
10193 const allureResults = path . dirname ( allureResultFile ) ;
10294
10395 if ( allureResults === allureResultsWatch ) {
104- log ( `afterSpec allureResultsWatch the same as allureResults ${ allureResults } ) ;
96+ log ( `copyFileToWatch allureResultsWatch the same as allureResults ${ allureResults } ) ;
10597
10698 return ;
10799 }
@@ -111,8 +103,8 @@ const copyFileToWatch = async (
111103 log ( `allureResultsWatch: ${ allureResultsWatch } ) ;
112104 log ( `attachments: ${ JSON . stringify ( attachments ) } ) ;
113105
114- await copyAttachments ( attachments , allureResultsWatch , allureResultFile ) ;
115- await copyTest ( allureResultFile , allureResultsWatch ) ;
106+ copyAttachments ( allTasks , attachments , allureResultsWatch , allureResultFile ) ;
107+ copyTest ( allTasks , allureResultFile , allureResultsWatch ) ;
116108} ;
117109
118110/**
@@ -458,7 +450,7 @@ export class AllureReporter {
458450
459451 writeFileSync ( testFile , JSON . stringify ( testCon ) ) ;
460452 } catch ( e ) {
461- console . log ( `Could not attach screenshot ${ x . screenshotId } ) ;
453+ console . log ( `${ packageLog } Could not attach screenshot ${ x . screenshotId } ) ;
462454 }
463455 } ) ;
464456 } ) ;
@@ -500,11 +492,23 @@ export class AllureReporter {
500492 } ) ;
501493 }
502494
495+ async waitAllTasksToFinish ( ) {
496+ await Promise . all ( allTasks )
497+ . then ( ( ) => {
498+ log ( `All tasks completed (${ allTasks . length } ) ;
499+ } )
500+ . catch ( err => {
501+ console . error ( `${ packageLog } ${ allTasks . length } , err ) ;
502+ } ) ;
503+
504+ log ( 'All files / video copying tasks finished!' ) ;
505+ }
506+
503507 /**
504508 * Attach video to parent suite
505509 * @param arg {path: string}
506510 */
507- async attachVideoToContainers ( arg : { path : string } ) {
511+ attachVideoToContainers ( arg : { path : string } ) {
508512 // this happens after test and suites have already finished
509513 const { path : videoPath } = arg ;
510514 log ( `attachVideoToTests: ${ videoPath } ) ;
@@ -518,81 +522,78 @@ export class AllureReporter {
518522 const tests = res
519523 . filter ( t => ( this . allureAddVideoOnPass ? true : t . status !== 'passed' && t . status !== 'skipped' ) )
520524 . map ( t => ( {
521- path : t . labels . find ( l => l . name === 'path' ) ?. value ,
525+ path : t . labels . find ( ( l : any ) => l . name === 'path' ) ?. value ,
522526 id : t . uuid ,
523527 fullName : t . fullName ,
524528 parent : t . parent ,
525529 } ) ) ;
526530
527531 const testsAttach = tests . filter ( t => t . path && t . path . indexOf ( specname ) !== - 1 ) ;
528532
529- let doneFiles = 0 ;
530-
531- readFile ( videoPath , errVideo => {
532- if ( errVideo ) {
533- console . error ( `${ packageLog } ${ errVideo } ) ;
533+ try {
534+ readFileSync ( videoPath ) ;
535+ } catch ( errVideo ) {
536+ console . error ( `${ packageLog } ${ errVideo } ) ;
534537
535- return ;
536- }
538+ return ;
539+ }
537540
538- testsAttach . forEach ( test => {
541+ allTasks . push (
542+ ...testsAttach . map ( test => {
539543 if ( ! test . parent ) {
540544 console . error ( `${ packageLog } ${ test . fullName } ) ;
541545
542- return ;
546+ return Promise . resolve ( ) ;
543547 }
548+
544549 const containerFile = `${ this . allureResults } ${ test . parent . uuid } ;
545550 log ( `ATTACHING to container: ${ containerFile } ) ;
546551
547- readFile ( containerFile , ( err , contents ) => {
548- if ( err ) {
549- log ( `error reading container: ${ err . message } ) ;
552+ return readFile ( containerFile )
553+ . then ( contents => {
554+ const uuid = randomUUID ( ) ;
555+ const nameAttAhc = `${ uuid } ${ ext } ;
556+ const newPath = path . join ( this . allureResults , nameAttAhc ) ;
557+ const newContentJson = createNewContentForContainer ( nameAttAhc , contents , ext , specname ) ;
558+ const newContent = JSON . stringify ( newContentJson ) ;
550559
551- return ;
552- }
553- const uuid = randomUUID ( ) ;
554- const nameAttAhc = `${ uuid } ${ ext } ;
555- const newPath = path . join ( this . allureResults , nameAttAhc ) ;
556- const newContentJson = createNewContentForContainer ( nameAttAhc , contents , ext , specname ) ;
557- const newContent = JSON . stringify ( newContentJson ) ;
560+ const writeContainer = ( ) => {
561+ log ( `write result file ${ containerFile } ) ;
558562
559- const writeContainer = ( ) => {
560- log ( `write result file ${ containerFile } ) ;
561- writeResultFile ( containerFile , newContent , ( ) => {
562- doneFiles = doneFiles + 1 ;
563- } ) ;
564- } ;
563+ return writeResultFile ( containerFile , newContent ) ;
564+ } ;
565565
566- if ( existsSync ( newPath ) ) {
567- log ( `not writing video, file already exist in path ${ newPath } ) ;
568- writeContainer ( ) ;
566+ if ( existsSync ( newPath ) ) {
567+ log ( `not writing video, file already exists in path ${ newPath } ) ;
569568
570- return ;
571- }
569+ return writeContainer ( ) ;
570+ }
572571
573- copyFileCp ( videoPath , newPath , false , ( ) => {
574- writeContainer ( ) ;
572+ return copyFileCp ( videoPath , newPath , false ) . then ( writeContainer ) ;
573+ } )
574+ . catch ( err => {
575+ log ( `error reading container: ${ err . message } ) ;
575576 } ) ;
576- } ) ;
577- } ) ;
578- } ) ;
579-
580- await waitWhileCondition ( ( ) => doneFiles < testsAttach . length ) ;
577+ } ) ,
578+ ) ;
581579 }
582580
583581 endGroup ( ) {
584582 // why >= 1?
585583 if ( this . groups . length >= 1 ) {
584+ log ( 'addGlobalHooks' ) ;
586585 this . addGlobalHooks ( ) ;
587586 }
588587
589588 if ( this . currentGroup ) {
589+ log ( 'END GROUP' ) ;
590590 this . currentGroup ?. endGroup ( ) ;
591591 this . groups . pop ( ) ;
592592 }
593593 }
594594
595595 endAllGroups ( ) {
596+ log ( 'endAllGroups' ) ;
596597 this . groups . forEach ( g => {
597598 g . endGroup ( ) ;
598599 } ) ;
@@ -748,24 +749,24 @@ export class AllureReporter {
748749 this . globalHooks . processForTest ( ) ;
749750 }
750751
751- async endTests ( ) {
752+ endTests ( ) {
752753 // eslint-disable-next-line @typescript-eslint/no-unused-vars
753754 for ( const _tst of this . tests ) {
754- await this . endTest ( { result : UNKNOWN , details : undefined } ) ;
755+ this . endTest ( { result : UNKNOWN , details : undefined } ) ;
755756 }
756757 }
757758
758- async endGroups ( ) {
759- await this . endTests ( ) ;
759+ endGroups ( ) {
760+ this . endTests ( ) ;
760761 this . groups . forEach ( ( ) => {
761762 this . endGroup ( ) ;
762763 } ) ;
763764 }
764765
765- async endAll ( ) {
766+ endAll ( ) {
766767 this . endAllSteps ( { status : UNKNOWN , details : undefined } ) ;
767768 this . endHooks ( Status . BROKEN ) ;
768- await this . endGroups ( ) ;
769+ this . endGroups ( ) ;
769770 }
770771
771772 addDescriptionHtml ( arg : AllureTaskArgs < 'addDescriptionHtml' > ) {
@@ -826,7 +827,7 @@ export class AllureReporter {
826827 }
827828 }
828829
829- async endTest ( arg : AllureTaskArgs < 'testEnded' > ) : Promise < void > {
830+ endTest ( arg : AllureTaskArgs < 'testEnded' > ) : void {
830831 const { result, details } = arg ;
831832 const storedStatus = this . testStatusStored ;
832833 const storedDetails = this . testDetailsStored ;
@@ -888,9 +889,8 @@ export class AllureReporter {
888889 waitResultWritten ( this . allureResults , testFile ) ;
889890
890891 // move to watch
891-
892892 log ( 'testEnded: will move result to watch folder' ) ;
893- await copyFileToWatch ( { test : testFile , attachments } , this . allureResultsWatch ) ;
893+ copyFileToWatch ( { test : testFile , attachments } , this . allureResultsWatch ) ;
894894 }
895895
896896 startStep ( arg : AllureTaskArgs < 'stepStarted' > ) {
0 commit comments