@@ -282,7 +282,7 @@ afterEach(() => {
282
282
const attributes = Cypress . mocha . getRunner ( ) . suite . ctx . currentTest ;
283
283
cy . window ( ) . then ( async ( win ) => {
284
284
let shouldScanTestForAccessibility = shouldScanForAccessibility ( attributes ) ;
285
- if ( ! shouldScanTestForAccessibility ) return ;
285
+ if ( ! shouldScanTestForAccessibility ) return cy . wrap ( { } ) ;
286
286
287
287
cy . wrap ( performScan ( win ) , { timeout : 30000 } ) . then ( ( ) => {
288
288
try {
@@ -323,39 +323,51 @@ afterEach(() => {
323
323
} )
324
324
325
325
Cypress . Commands . add ( 'performScan' , ( ) => {
326
- cy . window ( ) . then ( async ( win ) => {
327
- await performScan ( win ) ;
328
- return await getAccessibilityResultsSummary ( win ) ;
329
- } ) ;
326
+ try {
327
+ const attributes = Cypress . mocha . getRunner ( ) . suite . ctx . currentTest || Cypress . mocha . getRunner ( ) . suite . ctx . _runnable ;
328
+ const shouldScanTestForAccessibility = shouldScanForAccessibility ( attributes ) ;
329
+ if ( ! shouldScanTestForAccessibility ) {
330
+ console . log ( `Not a Accessibility Automation session, cannot perform scan.` ) ;
331
+ return cy . wrap ( { } ) ;
332
+ }
333
+ cy . window ( ) . then ( async ( win ) => {
334
+ await performScan ( win ) ;
335
+ return await getAccessibilityResultsSummary ( win ) ;
336
+ } ) ;
337
+ } catch { }
330
338
} )
331
339
332
340
Cypress . Commands . add ( 'getAccessibilityResultsSummary' , ( ) => {
333
341
try {
334
- if ( Cypress . env ( "IS_ACCESSIBILITY_EXTENSION_LOADED" ) !== "true" ) {
335
- console . log ( `Not a Accessibility Automation session, cannot retrieve Accessibility results.` ) ;
336
- return
342
+ const attributes = Cypress . mocha . getRunner ( ) . suite . ctx . currentTest || Cypress . mocha . getRunner ( ) . suite . ctx . _runnable ;
343
+ const shouldScanTestForAccessibility = shouldScanForAccessibility ( attributes ) ;
344
+ if ( ! shouldScanTestForAccessibility ) {
345
+ console . log ( `Not a Accessibility Automation session, cannot retrieve Accessibility results summary.` ) ;
346
+ return cy . wrap ( { } ) ;
337
347
}
338
- cy . window ( ) . then ( async ( win ) => {
339
- await performScan ( win ) ;
340
- return await getAccessibilityResultsSummary ( win ) ;
341
- } ) ;
348
+ cy . window ( ) . then ( async ( win ) => {
349
+ await performScan ( win ) ;
350
+ return await getAccessibilityResultsSummary ( win ) ;
351
+ } ) ;
342
352
} catch { }
343
353
344
354
} ) ;
345
355
346
356
Cypress . Commands . add ( 'getAccessibilityResults' , ( ) => {
347
357
try {
348
- if ( Cypress . env ( "IS_ACCESSIBILITY_EXTENSION_LOADED" ) !== "true" ) {
358
+ const attributes = Cypress . mocha . getRunner ( ) . suite . ctx . currentTest || Cypress . mocha . getRunner ( ) . suite . ctx . _runnable ;
359
+ const shouldScanTestForAccessibility = shouldScanForAccessibility ( attributes ) ;
360
+ if ( ! shouldScanTestForAccessibility ) {
349
361
console . log ( `Not a Accessibility Automation session, cannot retrieve Accessibility results.` ) ;
350
- return
362
+ return cy . wrap ( { } ) ;
351
363
}
352
364
353
365
/* browserstack_accessibility_automation_script */
354
366
355
- cy . window ( ) . then ( async ( win ) => {
356
- await performScan ( win ) ;
357
- return await getAccessibilityResults ( win ) ;
358
- } ) ;
367
+ cy . window ( ) . then ( async ( win ) => {
368
+ await performScan ( win ) ;
369
+ return await getAccessibilityResults ( win ) ;
370
+ } ) ;
359
371
360
372
} catch { }
361
373
0 commit comments