Merge pull request #459 from LambdaTest/dev

Dev

Author: abhishek-lambda

.github/workflows/npm-publish.yml

@@ -7,34 +7,37 @@ on:
   release:
     types: [created]
 
+permissions:
+  id-token: write  # Required for OIDC
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'lambdatest'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
       - run: npm ci
 
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - name: PUBLISHING Cypress CLI Version ${{ github.event.release.tag_name }}
         run: |
+          npm install -g npm@latest
           npm ci
           npm publish --access public
           echo "CHECKING on NPM REPO, whether new version starts reflecting there or not:";
           npm view lambdatest-cypress-cli versions --json
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
       - name: Send custom JSON data to Slack workflow
         id: slack
         uses: slackapi/[email protected]

accessibility/plugin/index.js

@@ -90,6 +90,7 @@ const Accessibility = (on, config) => {
   })
 
     let browser_validation = true;
+    let cli_version;
 
     on('before:browser:launch', (browser = {}, launchOptions) => {
         try {
@@ -119,6 +120,8 @@ const Accessibility = (on, config) => {
               return launchOptions
             }
           }
+          cli_version = execSync("npx lambdatest-cypress --version");
+          cli_version = cli_version.toString().trim();
         } catch(err) {
           console.log(`Error in loading Accessibility Automation extension: ${err.message}`);
         }
@@ -133,7 +136,6 @@ const Accessibility = (on, config) => {
       config.env.ACCESSIBILITY_OVERIDE_COMMANDS = process.env.ACCESSIBILITY_OVERIDE_COMMANDS;
       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)
@@ -146,6 +148,7 @@ const Accessibility = (on, config) => {
       console.log(`parameter for accessibility report GENERATE_REPORT_API -` + config.env.GENERATE_REPORT_API)
       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)
+      console.log(`parameter for accessibility report CYPRESS_CLI_VERSION -` + cli_version)
 
       return config;
 }

accessibility/scanner/index.js

@@ -194,19 +194,16 @@ const processAccessibilityReport = async (windowNew) => {
             if (captureScreenshot) {
                 if (scanData && scanData.data && scanData.data.length > 0 && globalScreenshots) {
                     const firstDataItem = scanData.data[0];
+                    
+                    // Extension always provides screenshotId and screenBound in each issue
+                    // Get screenshotId from the first issue to use the extension's ID
                     if (firstDataItem.events && firstDataItem.events.length > 0) {
                         const firstEvent = firstDataItem.events[0];
-                        if (firstEvent.issues && firstEvent.issues.length > 0) {
-                            // Update screenshotId with the actual screenshotId
-                            globalScreenshots[0].screenshotId=firstEvent.issues[0].screenshotId;
-                        }
-                    }
-                    for (let i = 0; i < scanData.data.length; i++) {
-                        if (scanData.data[i].screenshots && Array.isArray(scanData.data[i].screenshots)) {
-                            scanData.data[i].screenshots = globalScreenshots;
-                            break;
+                        if (firstEvent.issues && firstEvent.issues.length > 0 && firstEvent.issues[0].screenshotId) {
+                            globalScreenshots[0].screenshotId = firstEvent.issues[0].screenshotId;
                         }
                     }
+                    scanData.data[0].screenshots = globalScreenshots;
                 }
                 globalScreenshots = null;
             }