Skip to content

Commit ef08653

Browse files
committed
fix: timeouts
1 parent 2d90a82 commit ef08653

File tree

1 file changed

+30
-18
lines changed
  • bin/accessibility-automation/cypress

1 file changed

+30
-18
lines changed

bin/accessibility-automation/cypress/index.js

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ afterEach(() => {
282282
const attributes = Cypress.mocha.getRunner().suite.ctx.currentTest;
283283
cy.window().then(async (win) => {
284284
let shouldScanTestForAccessibility = shouldScanForAccessibility(attributes);
285-
if (!shouldScanTestForAccessibility) return;
285+
if (!shouldScanTestForAccessibility) return cy.wrap({});
286286

287287
cy.wrap(performScan(win), {timeout: 30000}).then(() => {
288288
try {
@@ -323,39 +323,51 @@ afterEach(() => {
323323
})
324324

325325
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 {}
330338
})
331339

332340
Cypress.Commands.add('getAccessibilityResultsSummary', () => {
333341
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({});
337347
}
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+
});
342352
} catch {}
343353

344354
});
345355

346356
Cypress.Commands.add('getAccessibilityResults', () => {
347357
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) {
349361
console.log(`Not a Accessibility Automation session, cannot retrieve Accessibility results.`);
350-
return
362+
return cy.wrap({});
351363
}
352364

353365
/* browserstack_accessibility_automation_script */
354366

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+
});
359371

360372
} catch {}
361373

0 commit comments

Comments
 (0)