@@ -14,40 +14,68 @@ import type Log from '../instruments/instrument-model'
1414import Session , { SessionProps } from '../sessions/sessions-model'
1515
1616export default class Attempt {
17- @ observable agents : Agent [ ] = [ ]
18- @ observable sessions : Record < string , Session > = { }
19- @ observable commands : Command [ ] = [ ]
20- @ observable err ?: Err = undefined
21- @ observable hooks : Hook [ ] = [ ]
17+ agents : Agent [ ] = [ ]
18+ sessions : Record < string , Session > = { }
19+ commands : Command [ ] = [ ]
20+ err ?: Err = undefined
21+ hooks : Hook [ ] = [ ]
2222 // TODO: make this an enum with states: 'QUEUED, ACTIVE, INACTIVE'
23- @ observable isActive : boolean | null = null
24- @ observable routes : Route [ ] = [ ]
25- @ observable _state ?: TestState | null = null
26- @ observable _testOuterStatus ?: TestState = undefined
27- @ observable _invocationCount : number = 0
28- @ observable invocationDetails ?: FileDetails
23+ isActive : boolean | null = null
24+ routes : Route [ ] = [ ]
25+ _state ?: TestState | null = null
26+ _testOuterStatus ?: TestState = undefined
27+ _invocationCount : number = 0
28+ invocationDetails ?: FileDetails
2929 // eslint-disable-next-line @typescript-eslint/no-unused-vars
30- @ observable hookCount : { [ name in HookName ] : number } = {
30+ hookCount : { [ name in HookName ] : number } = {
3131 'before all' : 0 ,
3232 'before each' : 0 ,
3333 'after all' : 0 ,
3434 'after each' : 0 ,
3535 'test body' : 0 ,
3636 'studio commands' : 0 ,
3737 }
38- @ observable _isOpen : boolean | null = null
38+ _isOpen : boolean | null = null
3939
40- @ observable isOpenWhenLast : boolean | null = null
40+ isOpenWhenLast : boolean | null = null
4141 _callbackAfterUpdate : Function | null = null
4242 testId : string
4343
44- @ observable id : number
44+ id : number
4545 test : Test
4646
4747 _logs : { [ key : string ] : Log } = { }
4848
4949 constructor ( props : TestProps , test : Test ) {
50- makeObservable ( this )
50+ makeObservable ( this , {
51+ agents : observable ,
52+ sessions : observable ,
53+ commands : observable ,
54+ err : observable ,
55+ hooks : observable ,
56+ isActive : observable ,
57+ routes : observable ,
58+ _state : observable ,
59+ _testOuterStatus : observable ,
60+ _invocationCount : observable ,
61+ invocationDetails : observable ,
62+ hookCount : observable ,
63+ _isOpen : observable ,
64+ isOpenWhenLast : observable ,
65+ id : observable ,
66+ hasCommands : computed ,
67+ isLongRunning : computed ,
68+ _hasLongRunningCommand : computed ,
69+ state : computed ,
70+ error : computed ,
71+ isLast : computed ,
72+ isOpen : computed ,
73+ start : action ,
74+ update : action ,
75+ setIsOpen : action ,
76+ finish : action ,
77+ } )
78+
5179 this . testId = props . id
5280 this . id = props . currentRetry || 0
5381 this . test = test
@@ -66,25 +94,25 @@ export default class Attempt {
6694 _ . each ( props . routes , this . addLog )
6795 }
6896
69- @ computed get hasCommands ( ) {
97+ get hasCommands ( ) {
7098 return ! ! this . commands . length
7199 }
72100
73- @ computed get isLongRunning ( ) {
101+ get isLongRunning ( ) {
74102 return this . isActive && this . _hasLongRunningCommand
75103 }
76104
77- @ computed get _hasLongRunningCommand ( ) {
105+ get _hasLongRunningCommand ( ) {
78106 return _ . some ( this . commands , ( command ) => {
79107 return command . isLongRunning
80108 } )
81109 }
82110
83- @ computed get state ( ) {
111+ get state ( ) {
84112 return this . _state || ( this . isActive ? 'active' : 'processing' )
85113 }
86114
87- @ computed get error ( ) {
115+ get error ( ) {
88116 const command = this . err ?. isCommandErr ? this . commandMatchingErr ( ) : undefined
89117
90118 return {
@@ -94,11 +122,11 @@ export default class Attempt {
94122 }
95123 }
96124
97- @ computed get isLast ( ) {
125+ get isLast ( ) {
98126 return this . id === this . test . lastAttempt . id
99127 }
100128
101- @ computed get isOpen ( ) {
129+ get isOpen ( ) {
102130 if ( this . _isOpen !== null ) {
103131 return this . _isOpen
104132 }
@@ -166,11 +194,11 @@ export default class Attempt {
166194 . last ( )
167195 }
168196
169- @ action start ( ) {
197+ start ( ) {
170198 this . isActive = true
171199 }
172200
173- @ action update ( props : UpdatableTestProps ) {
201+ update ( props : UpdatableTestProps ) {
174202 if ( props . state ) {
175203 this . _state = props . state
176204 }
@@ -200,11 +228,11 @@ export default class Attempt {
200228 }
201229 }
202230
203- @ action setIsOpen ( isOpen : boolean ) {
231+ setIsOpen ( isOpen : boolean ) {
204232 this . _isOpen = isOpen
205233 }
206234
207- @ action finish ( props : UpdatableTestProps , isInteractive : boolean ) {
235+ finish ( props : UpdatableTestProps , isInteractive : boolean ) {
208236 this . update ( props )
209237 this . isActive = false
210238
0 commit comments