Skip to content

Commit ac5ccdf

Browse files
committed
chore: Support platform env params
1 parent a88f32a commit ac5ccdf

File tree

2 files changed

+34
-39
lines changed

2 files changed

+34
-39
lines changed

bin/accessibility-automation/cypress/index.js

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
/* Event listeners + custom commands for Cypress */
22

33
Cypress.on('test:before:run', () => {
4+
console.log(`is loaded from before========> ${Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED")}`)
5+
if (Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED") !== "true") return
6+
const extensionPath = Cypress.env("ACCESSIBILITY_EXTENSION_PATH")
47

5-
console.log("env ACCESSIBILITY_EXTENSION_PATH ", process.env.ACCESSIBILITY_EXTENSION_PATH)
6-
console.log("Cypress.config()")
7-
console.log(Cypress.config())
8-
console.log("cypress.env.ACCESSIBILITY_EXTENSION_PATH")
9-
console.log(Cypress.env())
10-
11-
// if (process.env.ACCESSIBILITY_EXTENSION_PATH !== undefined) {
8+
if (extensionPath !== undefined) {
129
let rs = new Promise((resolve, reject) => {
1310
window.parent.addEventListener('A11Y_TAP_STARTED', () => {
1411
console.log("A11Y_TAP_STARTED !!!! resolving")
@@ -18,19 +15,19 @@ Cypress.on('test:before:run', () => {
1815
const e = new CustomEvent('A11Y_FORCE_START');
1916
window.parent.dispatchEvent(e);
2017
})
21-
console.log("rs")
22-
console.log(rs)
23-
console.log("rs 1")
24-
// }
18+
}
2519
})
2620

2721
Cypress.on('test:after:run', (attributes, runnable) => {
22+
console.log(`is loaded from after ========> ${Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED")}`)
23+
if (Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED") !== "true") return
2824
console.log("test:after:run !!!!!!!")
25+
const extensionPath = Cypress.env("ACCESSIBILITY_EXTENSION_PATH")
26+
const isHeaded = Cypress.browser.isHeaded;
27+
console.log(extensionPath)
28+
console.log(isHeaded)
2929
console.log("test:after:run !!!!!!!")
30-
console.log("test:after:run !!!!!!!")
31-
console.log("test:after:run !!!!!!!")
32-
console.log("test:after:run !!!!!!!")
33-
// if (process.env.ACCESSIBILITY_EXTENSION_PATH !== undefined) {
30+
if (isHeaded && extensionPath !== undefined) {
3431

3532
let shouldScanTestForAccessibility = true;
3633
// if (process.env.BROWSERSTACK_TEST_ACCESSIBILITY_CONFIGURATION_YML) {
@@ -60,35 +57,31 @@ Cypress.on('test:after:run', (attributes, runnable) => {
6057
]
6158
},
6259
"platform": {
63-
"os_name": process.env.SESSION_OS,
64-
"os_version": process.env.OS_VERSION,
65-
"browser_name": process.env.BROWSER,
66-
"browser_version": process.env.BROWSER_VERSION
60+
"os_name": Cypress.platform === "darwin" ? "mac" : "windows",
61+
"os_version": Cypress.env("OS_VERSION"),
62+
"browser_name": Cypress.browser.name,
63+
"browser_version": Cypress.browser.version
6764
}
6865
};
69-
console.log("test:after:run !!!!!!! dataForExtension")
70-
console.log(dataForExtension)
71-
console.log("test:after:run !!!!!!! dataForExtension 2 ")
7266
return new Promise((resolve, reject) => {
73-
console.log("dataForExtension")
74-
console.log(dataForExtension)
75-
7667
if (dataForExtension.saveResults) {
7768
window.parent.addEventListener('A11Y_TAP_TRANSPORTER', (event) => {
7869
resolve(event.detail);
7970
});
8071
}
8172
const e = new CustomEvent('A11Y_TEST_END', {detail: dataForExtension});
8273
window.parent.dispatchEvent(e);
83-
if (dataForExtension.saveResults !== true ) {
74+
if (dataForExtension.saveResults !== true )
8475
resolve();
85-
}
8676
});
87-
// }
77+
}
8878

8979
});
9080

9181
Cypress.Commands.add('getAccessibilityResultsSummary', () => {
82+
console.log(`is loaded from get ========> ${Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED")}`)
83+
if (Cypress.env("IS_ACCESSIBILITY_EXTENSION_LOADED") !== "true") return
84+
9285
return new Promise(function (resolve, reject) {
9386
try{
9487
const e = new CustomEvent('A11Y_TAP_GET_RESULTS_SUMMARY');

bin/accessibility-automation/plugin/index.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
const path = require("node:path");
33

44
const browserstackAccessibility = (on, config) => {
5+
let browser_validation = true;
56
on('before:browser:launch', (browser = {}, launchOptions) => {
67
try {
7-
config.env.ACCESSIBILITY_EXTENSION_PATH = "process.env.ACCESSIBILITY_EXTENSION_PATH";
8-
9-
if (process.env.ACCESSIBILITY_EXTENSION_PATH !== undefined) {
8+
console.log(`ACCESSIBILITY_EXTENSION_PATH :: ${process.env.ACCESSIBILITY_EXTENSION_PATH}`)
109

10+
if (process.env.ACCESSIBILITY_EXTENSION_PATH === undefined) {
11+
browser_validation = false
12+
return
1113
}
1214

13-
let browser_validation = true;
1415
// add accessibility attribute validation !!
1516
// add OS validation !!
1617
if (browser.name !== 'chrome') {
@@ -28,21 +29,22 @@ const browserstackAccessibility = (on, config) => {
2829

2930
if (browser_validation) {
3031
console.log(` inside before browser launch -> process.env.ACCESSIBILITY_EXTENSION_PATH - ${process.env.ACCESSIBILITY_EXTENSION_PATH}`)
32+
const ally_path = path.dirname(process.env.ACCESSIBILITY_EXTENSION_PATH)
33+
console.log(`FROM NODE ally_path : ${ally_path}`)
3134
launchOptions.args.push('--auto-open-devtools-for-tabs');
32-
// const ally_path = path.dirname(process.env.ACCESSIBILITY_EXTENSION_PATH)
33-
// console.log(`FROM NODE ally_path : ${ally_path}`)
34-
// launchOptions.extensions.push(ally_path);
35-
36-
launchOptions.extensions.push("/Users/riyadoshi1/cypress-example-kitchensink/0.0.8.0-debug")
37-
// console.log(launchOptions.args)
35+
launchOptions.extensions.push(ally_path);
3836
return launchOptions
3937
}
40-
4138
} catch (e){
4239
console.log(`catch error : ${e}`)
4340
}
4441

4542
})
43+
config.env.ACCESSIBILITY_EXTENSION_PATH = process.env.ACCESSIBILITY_EXTENSION_PATH
44+
config.env.OS_VERSION = process.env.OS_VERSION
45+
config.env.IS_ACCESSIBILITY_EXTENSION_LOADED = browser_validation.toString()
46+
config.env.ACCESSIBILITY_VAL_2 = "1234567"
47+
return config;
4648
}
4749

4850
module.exports = browserstackAccessibility;

0 commit comments

Comments
 (0)