Skip to content

Commit 8315ed6

Browse files
committed
review changes
1 parent 7da618d commit 8315ed6

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

bin/accessibility-automation/cypress/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Cypress.on('test:after:run', (attributes, runnable) => {
4242
const excluded = excludeTagArray.some((exclude) => fullTestName.includes(exclude));
4343
const included = includeTagArray.length === 0 || includeTags.some((include) => fullTestName.includes(include));
4444
shouldScanTestForAccessibility = !excluded && included;
45-
} catch (error){
45+
} catch (error) {
4646
console.log("Error while validating test case for accessibility before scanning. Error : ", error);
4747
}
4848
}
@@ -52,14 +52,18 @@ Cypress.on('test:after:run', (attributes, runnable) => {
5252
} else {
5353
os_data = Cypress.platform === 'linux' ? 'mac' : "win"
5454
}
55+
let filePath = '';
56+
if (attributes.invocationDetails.relativeFile !== undefined) {
57+
filePath = attributes.invocationDetails.relativeFile;
58+
}
5559
const dataForExtension = {
5660
"saveResults": shouldScanTestForAccessibility,
5761
"testDetails": {
5862
"name": attributes.title,
5963
"testRunId": '5058', // variable not consumed, shouldn't matter what we send
60-
"filePath": attributes.invocationDetails.relativeFile,
64+
"filePath": filePath,
6165
"scopeList": [
62-
attributes.invocationDetails.relativeFile,
66+
filePath,
6367
attributes.title
6468
]
6569
},

bin/accessibility-automation/helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
8888
if (process.env.BS_A11Y_JWT) {
8989
process.env.BROWSERSTACK_TEST_ACCESSIBILITY = 'true';
9090
}
91+
logger.debug(`BrowserStack Accessibility Automation Test Run ID: ${response.data.data.id}`);
9192

9293
this.setAccessibilityCypressCapabilities(user_config, response.data);
9394
setAccessibilityEventListeners();
@@ -163,7 +164,6 @@ const getAccessibilityCypressCommandEventListener = () => {
163164
}
164165

165166
const setAccessibilityEventListeners = () => {
166-
logger.info("setAccessibilityEventListeners")
167167
try {
168168
const cypressCommandEventListener = getAccessibilityCypressCommandEventListener();
169169
glob(process.cwd() + '/cypress/support/*.js', {}, (err, files) => {

bin/helpers/capabilityHelper.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,12 @@ const caps = (bsConfig, zip) => {
149149
const getAccessibilityPlatforms = (bsConfig) => {
150150
const browserList = bsConfig.browsers;
151151
const accessibilityPlatforms = Array(browserList.length).fill(false);
152+
let rootLevelAccessibility = false;
153+
if (bsConfig.run_settings.accessibility !== undefined) {
154+
rootLevelAccessibility = bsConfig.run_settings.accessibility.toString() === 'true'
155+
}
152156
browserList.forEach((browserDetails, idx) => {
153-
accessibilityPlatforms[idx] = (browserDetails.accessibility === undefined) ? false : browserDetails.accessibility
157+
accessibilityPlatforms[idx] = (browserDetails.accessibility === undefined) ? rootLevelAccessibility : browserDetails.accessibility
154158
});
155159
return accessibilityPlatforms;
156160
}

0 commit comments

Comments
 (0)