Merge pull request #347 from LambdaTest/stage

Release PR Version `4.1.28` Exit code throwing at end of cli process

Author: sushobhit-lt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "4.1.27",
+  "version": "4.1.28",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"

src/lib/httpClient.ts

@@ -142,6 +142,10 @@ export default class httpClient {
         const response = await this.request({
             url: '/token/verify',
             method: 'GET',
+            headers:{
+                userName : env.LT_USERNAME,
+                accessKey: env.LT_ACCESS_KEY
+            }
         }, log);
         if (response && response.projectToken) {
             this.projectToken = response.projectToken;
@@ -157,8 +161,8 @@ export default class httpClient {
 
     async authExec(ctx: Context, log: Logger, env: Env): Promise<{ authResult: number, orgId: number, userId: number }> {
         let authResult = 1;
-        let userName = '';
-        let passWord = '';
+        let userName = ctx.env.LT_USERNAME;
+        let passWord = ctx.env.LT_ACCESS_KEY;
         if (ctx.config.tunnel) {
             if (ctx.config.tunnel?.user && ctx.config.tunnel?.key) {
                 userName = ctx.config.tunnel.user
@@ -202,10 +206,14 @@ export default class httpClient {
         }
     }
 
-    createBuild(git: Git, config: any, log: Logger, buildName: string, isStartExec: boolean, smartGit: boolean, markBaseline: boolean, baselineBuild: string, scheduled?: string) {
+    createBuild(git: Git, config: any, log: Logger, buildName: string, isStartExec: boolean, smartGit: boolean, markBaseline: boolean, baselineBuild: string, scheduled?: string,userName?: string,accessKey?: string) {
         return this.request({
             url: '/build',
             method: 'POST',
+            headers:{
+                userName,
+                accessKey
+            },
             data: {
                 git,
                 config,
@@ -390,7 +398,7 @@ export default class httpClient {
 
     uploadScreenshot(
         { id: buildId, name: buildName, baseline }: Build,
-        ssPath: string, ssName: string, browserName: string, viewport: string, log: Logger
+        ssPath: string, ssName: string, browserName: string, viewport: string, url: string = '', log: Logger
     ) {
         browserName = browserName === constants.SAFARI ? constants.WEBKIT : browserName;
         const file = fs.readFileSync(ssPath);
@@ -402,6 +410,7 @@ export default class httpClient {
         form.append('buildName', buildName);
         form.append('screenshotName', ssName);
         form.append('baseline', baseline.toString());
+        form.append('pageUrl',url)
 
         return this.axiosInstance.request({
             url: `/screenshot`,

src/lib/screenshot.ts

@@ -57,7 +57,7 @@ async function captureScreenshotsForConfig(
 
             await page?.screenshot({ path: ssPath, fullPage });
 
-            await ctx.client.uploadScreenshot(ctx.build, ssPath, name, browserName, viewportString, ctx.log);
+            await ctx.client.uploadScreenshot(ctx.build, ssPath, name, browserName, viewportString, url, ctx.log);
         }
     } catch (error) {
         throw new Error(`captureScreenshotsForConfig failed for browser ${browserName}; error: ${error}`);
@@ -253,7 +253,7 @@ export async function uploadScreenshots(ctx: Context): Promise<void> {
                         }
                     }
 
-                    await ctx.client.uploadScreenshot(ctx.build, filePath, ssId, 'default', viewport, ctx.log);
+                    await ctx.client.uploadScreenshot(ctx.build, filePath, ssId, 'default', viewport,"", ctx.log);
                     ctx.log.info(`${filePath} : uploaded successfully`)
                     noOfScreenshots++;
                 } else {

src/tasks/createBuild.ts

@@ -10,7 +10,7 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
             updateLogContext({task: 'createBuild'});
 
             try {
-                let resp = await ctx.client.createBuild(ctx.git, ctx.config, ctx.log, ctx.build.name, ctx.isStartExec, ctx.env.SMART_GIT, ctx.options.markBaseline, ctx.options.baselineBuild, ctx.options.scheduled);
+                let resp = await ctx.client.createBuild(ctx.git, ctx.config, ctx.log, ctx.build.name, ctx.isStartExec, ctx.env.SMART_GIT, ctx.options.markBaseline, ctx.options.baselineBuild, ctx.options.scheduled,ctx.env.LT_USERNAME,ctx.env.LT_ACCESS_KEY);
                 if (resp && resp.data && resp.data.buildId) {
                     ctx.build = {
                         id: resp.data.buildId,

src/tasks/createBuildExec.ts

@@ -12,7 +12,7 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
 
             try {
                 if (ctx.authenticatedInitially && !ctx.config.skipBuildCreation) {
-                    let resp = await ctx.client.createBuild(ctx.git, ctx.config, ctx.log, ctx.build.name, ctx.isStartExec, ctx.env.SMART_GIT, ctx.options.markBaseline, ctx.options.baselineBuild, ctx.options.scheduled);
+                    let resp = await ctx.client.createBuild(ctx.git, ctx.config, ctx.log, ctx.build.name, ctx.isStartExec, ctx.env.SMART_GIT, ctx.options.markBaseline, ctx.options.baselineBuild, ctx.options.scheduled,ctx.env.LT_USERNAME,ctx.env.LT_ACCESS_KEY);
                     if (resp && resp.data && resp.data.buildId) {
                         ctx.build = {
                             id: resp.data.buildId,

src/tasks/exec.ts

@@ -39,7 +39,6 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
                     if (code !== null) {
                         task.title = `Execution of '${ctx.args.execCommand?.join(' ')}' completed; exited with code ${code}`;
                         if (code !== 0) {
-                            reject();
                             process.exitCode = code
                         }
                     } else if (signal !== null) {

src/tasks/finalizeBuild.ts

@@ -49,7 +49,6 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
                             } else {
                                 is_baseline = false;
                             }
-                            console.log(`start polling was called at finalize build for buildId: ${buildId}`)
                             startPolling(ctx, buildId, is_baseline, capabilities.projectToken);
                             await new Promise(resolve => setTimeout(resolve, 7000));
                             ctx.fetchResultsForBuild.push(buildId);
@@ -87,6 +86,12 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
                         let resp = ctx.client.sendCliLogsToLSRS(ctx);
                     }
                 }
+                if (process.exitCode && process.exitCode !== 0) {
+                    ctx.log.error(`Exiting process with code ${process.exitCode}`);
+                    task.output = chalk.gray(`Exiting process with code ${process.exitCode}`);
+                    task.title = 'Build finalized with errors';
+                    throw new Error(`Process exited with code ${process.exitCode}`);
+                }
             } catch (error: any) {
                 ctx.log.debug(error);
             }