Merge pull request #371 from abhishek-lambda/AT-281

At 281

Author: abhishek-lambda

accessibility/plugin/index.js

@@ -68,13 +68,15 @@ const Accessibility = (on, config) => {
       config.env.ACCESSIBILITY_REPORT_PATH = process.env.ACCESSIBILITY_REPORT_PATH;
       config.env.ACCESSIBILITY = process.env.ACCESSIBILITY;
       config.env.TEST_ID = process.env.TEST_ID;
+      config.env.ACCESSIBILITY_OVERIDE_COMMANDS = process.env.ACCESSIBILITY_OVERIDE_COMMANDS;
       console.log(`parameter for accessibility report ACCESSIBILITY - ` + config.env.ACCESSIBILITY)
       console.log(`parameter for accessibility report WCAG_CRITERIA - ` + config.env.WCAG_CRITERIA)
       console.log(`parameter for accessibility report BEST_PRACTICE -` + config.env.BEST_PRACTICE)
       console.log(`parameter for accessibility report NEEDS_REVIEW -` + config.env.NEEDS_REVIEW)
       console.log(`parameter for accessibility report ACCESSIBILITY_REPORT_PATH -` + config.env.ACCESSIBILITY_REPORT_PATH)
       console.log(`parameter for accessibility report TEST_ID -` + config.env.TEST_ID)
       console.log(`parameter for accessibility report ACCESSIBILITY_EXTENSION_PATH -` + process.env.ACCESSIBILITY_EXTENSION_PATH)
+      console.log(`parameter for accessibility report ACCESSIBILITY_OVERIDE_COMMANDS -` + config.env.ACCESSIBILITY_OVERIDE_COMMANDS)
 
 
       return config;

accessibility/scanner/index.js

@@ -10,6 +10,8 @@ const commandsToOverride = [
     'blur', 'focus', 'go', 'reload', 'submit', 'viewport', 'origin'
 ];
 
+const commandsToWrap = ['visit', 'click', 'type', 'request', 'dblclick', 'rightclick', 'clear', 'check', 'uncheck', 'select', 'trigger', 'selectFile', 'scrollIntoView', 'scroll', 'scrollTo', 'blur', 'focus', 'go', 'reload', 'submit', 'viewport', 'origin'];
+
 let currentWindow = null;
 Cypress.Commands.add('storeWindowObject', () => {
     cy.window().then(win => {
@@ -148,20 +150,116 @@ async function processAccessibilityReport(url) {
     }
 }
 
-commandsToOverride.forEach((command) => {
-    Cypress.Commands.overwrite(command, (originalFn, url, options) => {
+function oldprocessAccessibilityReport(win){
+    let wcagCriteriaValue = Cypress.env("WCAG_CRITERIA") || "wcag21a";
+    let bestPracticeValue = Cypress.env("BEST_PRACTICE") || false;
+    let needsReviewValue = Cypress.env("NEEDS_REVIEW") || true;
+    bestPracticeValue =  bestPracticeValue == "true" ? true : false;
+    needsReviewValue = needsReviewValue == "true" ? true : false;
+    const payloadToSend = {
+        message: 'SET_CONFIG',
+        wcagCriteria: wcagCriteriaValue,
+        bestPractice: bestPracticeValue,
+        needsReview: needsReviewValue
+    }
+
+    console.log('log', "payload to send " + payloadToSend);
+    let testId = Cypress.env("TEST_ID") || ""
+
+    const filePath = Cypress.env("ACCESSIBILITY_REPORT_PATH") || 'cypress/results/accessibilityReport_' + testId + '.json';
+
+    cy.wrap(setScanConfig(win, payloadToSend), {timeout: 30000}).then((res) => {
+        console.log('logging config reponse', res);
+
+        const payload = {
+            message: 'GET_LATEST_SCAN_DATA',
+        }
+
+        cy.wrap(getScanData(win, payload), {timeout: 45000}).then((res) => {
+            LambdatestLog('log', "scanning data ");
+
+
+            cy.task('initializeFile', filePath).then((filePath) => {
+                cy.task('readFileIfExists', filePath,{ log: true, timeout: 45000 }).then((result) => {
+                    let resultsArray = [{}];
+                    console.log('logging report', res);
+                    // If the file is not empty, parse the existing content
+                    if (result.exists && result.content) {
+                        try {
+                            resultsArray = JSON.parse(result.content);
+                        } catch (e) {
+                            console.log("parsing error for content " , result.content)
+                            console.log('Error parsing JSON file:', e);
+                            return;
+                        }
+                    } else if(!result.exists) {
+                        console.log('accessibility file does not exist');
+                    }
+                    if (res) {
+                        console.log('scanned data recieved is', res.message);
+                    }
+
+                    if (res && res.message == "GET_LATEST_SCAN_DATA") {
+                        try {
+                            // Append the new result
+                            resultsArray.push(res);
+                            console.log('resultsarray logging', resultsArray);
+                        } catch (e) {
+                            console.log('Error pushing issues to array:', e);
+                        }
+                    }
+
+                    // Write the updated content back to the file
+                    cy.writeFile(filePath, resultsArray, { log: true, timeout: 45000 });
+                });
+            });
+        });
+
+    });
+}
+
+const overRideCommands = Cypress.env("ACCESSIBILITY_OVERIDE_COMMANDS") || false;
+if (overRideCommands) {
+    commandsToOverride.forEach((command) => {
+        Cypress.Commands.overwrite(command, (originalFn, url, options) => {
+            let isAccessibilityLoaded = Cypress.env("ACCESSIBILITY") || false;
+            if (!isAccessibilityLoaded) {
+                console.log('log', "Accessibility not enabled.");
+                return originalFn(url, options);
+            }
+
+
+            return originalFn(url, options).then(async () => {
+
+                await processAccessibilityReport(url);
+            })
+
+        });
+    });
+}else{
+    Cypress.on('command:start', async (command) => {
+        if(!command || !command.attributes) return;
+        if(command.attributes.name == 'window' || command.attributes.name == 'then' || command.attributes.name == 'wrap' || command.attributes.name == 'wait') {
+            return;
+        }
+
+        if (!commandsToWrap.includes(command.attributes.name)) return;
         let isAccessibilityLoaded = Cypress.env("ACCESSIBILITY") || false;
-        if (!isAccessibilityLoaded) {
-            console.log('log', "Accessibility not enabled.");
-            return originalFn(url, options);
+        if (!isAccessibilityLoaded){
+            console.log('log', "accessibility not enabled " + isAccessibilityLoaded);
+            return;
         }
 
 
-        return originalFn(url, options).then(async () => {
-            await processAccessibilityReport(url);
+        console.log('log', "debugging scan form command " + command.attributes.name);
+
+        cy.window().then((win) => {
+            oldprocessAccessibilityReport(win);
         })
+    })
+
+}
+
 
-    });
-});