🎨 removed duplicate code

Author: Archish27

bin/helpers/utils.js

@@ -390,10 +390,6 @@ exports.setSpecTimeout = (bsConfig, args) => {
   logger.debug(`Setting spec timeout = ${specTimeout}`);
 }
 
-exports.isTimezoneArgPassed = () => {
-  return this.searchForOption('--timezone'); 
-}
-
 exports.isValidTimezone = (timezone) => {
   if(!this.isUndefined(timezone) && !this.isUndefined(TIMEZONE[timezone])) {
     return true;
@@ -402,28 +398,17 @@ exports.isValidTimezone = (timezone) => {
 }
 
 exports.setTimezone = (bsConfig, args) => {
-  let timezone = undefined;
-  if(this.isTimezoneArgPassed()) {
-    if(this.isNotUndefined(args.timezone)) { 
-      if(this.isValidTimezone(args.timezone)){
-        timezone = args.timezone; 
-      } else {
-        logger.error(`Invalid timezone = ${args.timezone}`);
-        syncCliLogger.info(chalk.red(Constants.userMessages.INVALID_TIMEZONE));
-        process.exit(1);
-      }
-    }
-  } else if (this.isNotUndefined(bsConfig.run_settings.timezone)) {
-    if(this.isValidTimezone(bsConfig.run_settings.timezone)){
-      timezone = bsConfig.run_settings.timezone; 
-    } else {
-      logger.error(`Invalid timezone = ${bsConfig.run_settings.timezone}`);
-      syncCliLogger.info(chalk.red(Constants.userMessages.INVALID_TIMEZONE));
-      process.exit(1);
-    }
+  let timezone = args.timezone || bsConfig.run_settings.timezone;
+  let newTimezone;
+  if(this.isNotUndefined(timezone) && this.isValidTimezone(timezone)){
+    newTimezone = timezone; 
+  } else {
+    logger.error(`Invalid timezone = ${timezone}`);
+    syncCliLogger.info(chalk.red(Constants.userMessages.INVALID_TIMEZONE));
+    process.exit(1);
   }
-  bsConfig.run_settings.timezone = timezone;
-  logger.debug(`Setting timezone = ${timezone}`);
+  bsConfig.run_settings.timezone = newTimezone;
+  logger.debug(`Setting timezone = ${newTimezone}`);
 }
 
 exports.setRecordFlag = (bsConfig, args) => {

test/unit/bin/helpers/utils.js

@@ -3725,19 +3725,16 @@ describe('utils', () => {
   });
 
   describe("setTimezone", () => {
-    let isTimezoneArgPassed;
     let processStub;
     let loggerStub;
     let syncCliLoggerStub;
     beforeEach(() => {
-      isTimezoneArgPassed = sinon.stub(utils, 'isTimezoneArgPassed');
       processStub = sinon.stub(process, 'exit');
       loggerStub = sinon.stub(winstonLogger, 'error');
       syncCliLoggerStub = sinon.stub(syncCliLogger, 'info');
     });
 
     afterEach(() => {
-      isTimezoneArgPassed.restore();
       processStub.restore();
       loggerStub.restore();
       syncCliLoggerStub.restore();
@@ -3751,7 +3748,6 @@ describe('utils', () => {
       let args = {
         timezone: "New_York"
       };
-      isTimezoneArgPassed.returns(true);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq("New_York");
     });
@@ -3763,7 +3759,6 @@ describe('utils', () => {
         }
       }
       let args = {};
-      isTimezoneArgPassed.returns(true);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq(undefined);
     });
@@ -3777,7 +3772,6 @@ describe('utils', () => {
       let args = {
         timezone: "xyz"
       };
-      isTimezoneArgPassed.returns(true);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq(undefined);
       sinon.assert.calledOnceWithExactly(loggerStub, "Invalid timezone = xyz");
@@ -3792,7 +3786,6 @@ describe('utils', () => {
         }
       }
       let args = {};
-      isTimezoneArgPassed.returns(false);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq(undefined);
       sinon.assert.calledOnceWithExactly(loggerStub, "Invalid timezone = abc");
@@ -3807,7 +3800,6 @@ describe('utils', () => {
         }
       }
       let args = {};
-      isTimezoneArgPassed.returns(false);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq("London");
     });
@@ -3817,7 +3809,6 @@ describe('utils', () => {
         run_settings: {}
       }
       let args = {};
-      isTimezoneArgPassed.returns(false);
       utils.setTimezone(bsConfig, args);
       expect(bsConfig.run_settings.timezone).to.eq(undefined);
     });