improved functions

Author: Shahnawaz-Sk

src/service.js

@@ -226,12 +226,12 @@ export default class LambdaRestService {
 
     if (!this._browser.isMultiremote) {
       log.info(`Update job with sessionId ${this._browser.sessionId}, ${status}`);
-      return this._update(this._browser.sessionId, result);
+      return this._update({sessionId: this._browser.sessionId, failures: result});
     }
 
     return Promise.all(Object.keys(this._capabilities).map(browserName => {
       log.info(`Update multiremote job for browser '${browserName}' and sessionId ${this._browser[browserName].sessionId}, ${status}`);
-      return this._update(this._browser[browserName].sessionId, failures, false, browserName);
+      return this._update({sessionId: this._browser[browserName].sessionId, failures: failures, calledOnReload: false, browserName: browserName});
     }));
   }
 
@@ -245,12 +245,12 @@ export default class LambdaRestService {
     if (!this._browser.isMultiremote) {
       log.info(`Update (reloaded) job with sessionId ${oldSessionId}, ${status}`);
 
-      await this._updateOnReload(oldSessionId, this._currrentTestTitle, status, true);
+      await this._update({sessionId: oldSessionId, fullTitle: this._currrentTestTitle, status: status, calledOnReload: true});
 
     } else {
       const browserName = this._browser.instances.filter(browserName => this._browser[browserName].sessionId === newSessionId)[0];
       log.info(`Update (reloaded) multiremote job for browser '${browserName}' and sessionId ${oldSessionId}, ${status}`);
-      await this._update(oldSessionId, this._failures, true, browserName);
+      await this._update({sessionId : oldSessionId, failures:this._failures, calledOnReload: true, browserName: browserName});
     }
 
     this._failReasons = [];
@@ -259,40 +259,25 @@ export default class LambdaRestService {
     delete this._fullTitle;
   }
 
-  async _update(sessionId, failures, calledOnReload = false, browserName) {
+  async _update({sessionId, fullTitle , status , failures, calledOnReload = false, browserName}) {
     if (!this._options.setSessionStatus) {
       return;
     }
     const sleep = ms => new Promise(r => setTimeout(r, ms));
     await sleep(5000);
-    return await this.updateJob(sessionId, failures, calledOnReload, browserName);
-  }
-
-  async _updateOnReload(sessionId, fullTitle, status, calledOnReload = false, browserName) {
-    if (!this._options.setSessionStatus) {
-      return;
+    if (calledOnReload){
+      return await this.updateJob({sessionId, fullTitle, status, calledOnReload , browserName});
     }
-    const sleep = ms => new Promise(r => setTimeout(r, ms));
-    await sleep(5000);
-    return await this.updateJobOnReload(sessionId, fullTitle, status, calledOnReload, browserName);
+    return await this.updateJob({sessionId, _failures: failures, calledOnReload, browserName});
+  
   }
 
-  async updateJob(sessionId, _failures, calledOnReload = false, browserName) {
-    const body = this.getBody(_failures, calledOnReload, browserName);
-    try {
-      if(this._ltErrorRemark && this._error !== null && this._error !== undefined)
-      {
-      await this._setSessionRemarks(this._error);
-      }
-      await updateSessionById(sessionId, body, this._lambdaCredentials);
-    } catch (ex) {
-      console.log(ex);
+  async updateJob({sessionId, fullTitle, status , _failures, calledOnReload = false, browserName}) {
+    
+    let body = this.getBody({_failures, calledOnReload, browserName});
+    if(calledOnReload){
+       body = this.getBody({fullTitle, status, calledOnReload, browserName});
     }
-    this._failures = 0;
-  }
-
-  async updateJobOnReload(sessionId, fullTitle, status, calledOnReload = false, browserName) {
-    const body = this.getBodyOnReload(fullTitle, status, calledOnReload, browserName);
     try {
       if(this._ltErrorRemark && this._error !== null && this._error !== undefined)
       {
@@ -305,7 +290,7 @@ export default class LambdaRestService {
     this._failures = 0;
   }
 
-  getBody(_failures, calledOnReload = false, browserName) {
+  getBody({fullTitle, status, _failures, calledOnReload = false, browserName}) {
     let body = {};
     if (
       !(
@@ -315,6 +300,9 @@ export default class LambdaRestService {
       )
     ) {
       body.name = this._fullTitle;
+      if(calledOnReload){
+        body.name=fullTitle;
+      }
 
       if (this._capabilities['LT:Options'] && this._capabilities['LT:Options'].name) {
         body.name = this._capabilities['LT:Options'].name;
@@ -331,34 +319,16 @@ export default class LambdaRestService {
           testCnt = Math.ceil(testCnt / this._browser.instances.length);
         }
 
-        body.name += ` (${testCnt})`;
+        if (!calledOnReload){
+          body.name += ` (${testCnt})`;
+        }
       }
     }
     body.status_ind = _failures > 0 ? 'failed' : 'passed';
-    return body;
-  }
-
-  getBodyOnReload(fullTitle, status, calledOnReload = false, browserName) {
-    let body = {};
-    if (!(!this._browser.isMultiremote && this._capabilities.name || this._browser.isMultiremote && this._capabilities[browserName].capabilities.name)) {
-      body.name = fullTitle;
-      if (this._capabilities['LT:Options'] && this._capabilities['LT:Options'].name) {
-        body.name = this._capabilities['LT:Options'].name;
-      }
-      if (browserName) {
-        body.name = `${browserName}: ${body.name}`;
-      }
-      if (calledOnReload || this._testCnt) {
-        let testCnt = ++this._testCnt;
-        if (this._browser.isMultiremote) {
-          testCnt = Math.ceil(testCnt / this._browser.instances.length);
-        }
-        console.log(testCnt);
-      }
+    if (calledOnReload){
+      body.status_ind = status;
     }
-    body.status_ind = status;
     return body;
-
   }
 
   async setSessionName(suiteTitle, test) {