Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions accessibility/plugin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ const Accessibility = (on, config) => {
config.env.ACCESSIBILITY = process.env.ACCESSIBILITY;
config.env.TEST_ID = process.env.TEST_ID;
config.env.ACCESSIBILITY_OVERIDE_COMMANDS = process.env.ACCESSIBILITY_OVERIDE_COMMANDS;
config.env.CAPTURE_SCREENSHOT_ENABLED = process.env.CAPTURE_SCREENSHOT_ENABLED;
config.env.CAPTURE_SCREENSHOT = process.env.CAPTURE_SCREENSHOT;
config.env.PASSED_TEST_CASES = process.env.PASSED_TEST_CASES;

config.env.GENERATE_REPORT_API = process.env.GENERATE_REPORT_API || "NA";
console.log(`parameter for accessibility report ACCESSIBILITY - ` + config.env.ACCESSIBILITY)
console.log(`parameter for accessibility report WCAG_CRITERIA - ` + config.env.WCAG_CRITERIA)
Expand All @@ -142,7 +144,8 @@ const Accessibility = (on, config) => {
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)
console.log(`parameter for accessibility report GENERATE_REPORT_API -` + config.env.GENERATE_REPORT_API)
console.log(`parameter for accessibility report CAPTURE_SCREENSHOT_ENABLED -` + config.env.CAPTURE_SCREENSHOT_ENABLED)
console.log(`parameter for accessibility report CAPTURE_SCREENSHOT -` + config.env.CAPTURE_SCREENSHOT)
console.log(`parameter for accessibility report PASSED_TEST_CASES -` + config.env.PASSED_TEST_CASES)

return config;
}
Expand Down
16 changes: 9 additions & 7 deletions accessibility/scanner/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const LambdatestLog = (message) => {
}

let globalScreenshots = null;
const captureScreenshotEnabled = Cypress.env("CAPTURE_SCREENSHOT_ENABLED") === "true";
const captureScreenshot = Cypress.env("CAPTURE_SCREENSHOT") === "true";

const commandsToOverride = [
'visit', 'click', 'type', 'request', 'dblclick', 'rightclick', 'clear', 'check',
Expand Down Expand Up @@ -43,8 +43,8 @@ const performNewLambdaScan = (originalFn, Subject, stateType, ...args) => {
if (subjectChainFn !== null && subjectChainFn !== void 0) {
cypressCommandChain = subjectChainFn.call(cy);
}
if (captureScreenshotEnabled) {

if (captureScreenshot) {
cy.log('Starting performScanSubjectQuery');
cycustomChaining
.performScanSubjectQuery(cypressCommandChain, setTimeout)
Expand Down Expand Up @@ -163,14 +163,16 @@ const processAccessibilityReport = async (windowNew) => {
let wcagCriteriaValue = Cypress.env("WCAG_CRITERIA") || "wcag21a";
let bestPracticeValue = Cypress.env("BEST_PRACTICE") === "true";
let needsReviewValue = Cypress.env("NEEDS_REVIEW") !== "false"; // Default to true
let captureScreenshotEnabled = Cypress.env("CAPTURE_SCREENSHOT_ENABLED") === "true";
let captureScreenshot = Cypress.env("CAPTURE_SCREENSHOT") === "true";
let passedTestCases = Cypress.env("PASSED_TEST_CASES") === "true";

const payloadToSend = {
message: 'SET_CONFIG',
wcagCriteria: wcagCriteriaValue,
bestPractice: bestPracticeValue,
needsReview: needsReviewValue,
captureScreenshotEnabled: captureScreenshotEnabled
captureScreenshot: captureScreenshot,
passedTestCases: passedTestCases
};

console.log('log', "SET SCAN: Payload to send: ", payloadToSend);
Expand All @@ -187,7 +189,7 @@ const processAccessibilityReport = async (windowNew) => {
const payload = {message: 'GET_LATEST_SCAN_DATA'};
scanData = await getScanData(windowNew, payload);
LambdatestLog("GET SCAN:LambdaTest Accessibility: Scanning URL");
if(captureScreenshotEnabled){
if (captureScreenshot) {
if (scanData && scanData.data && scanData.data.length > 0 && globalScreenshots) {
const firstDataItem = scanData.data[0];
if (firstDataItem.events && firstDataItem.events.length > 0) {
Expand Down Expand Up @@ -220,7 +222,7 @@ const processAccessibilityReport = async (windowNew) => {
const filePath = Cypress.env("ACCESSIBILITY_REPORT_PATH") || ('cypress/results/accessibilityReport_' + testId + '.json');
console.log("TestID is",testId);
const payloadToSend = {
message: 'SEND_ACESSIBILITY_DATA',
message: 'SEND_ACCESSIBILITY_DATA',
testId : testId,
scanData: scanData,
accessibilityReportPath:filePath,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lambdatest-cypress-cli",
"version": "3.0.40",
"version": "3.0.41",
"description": "The lambdatest-cypress-cli is LambdaTest's command-line interface (CLI) aimed to help you run your Cypress tests on LambdaTest platform.",
"homepage": "https://github.com/LambdaTest/lambdatest-cypress-cli",
"author": "LambdaTest <[email protected]>",
Expand Down