Unit test cases fix for cli log changes

karanshah-browserstack · karanshah-browserstack · commit 9dc85c4c6e0f · 2020-10-30T20:51:48.000+05:30
diff --git a/test/unit/bin/commands/runs.js b/test/unit/bin/commands/runs.js
@@ -481,9 +481,6 @@ describe("runs", () => {
             messageType,
             errorCode
           );
-        })
-        .finally(function () {
-          sinon.assert.calledOnce(deleteZipStub);
         });
     });
   });
@@ -607,9 +604,6 @@ describe("runs", () => {
             messageType,
             errorCode
           );
-        })
-        .finally(function () {
-          sinon.assert.calledOnce(deleteZipStub);
         });
     });
   });
diff --git a/test/unit/bin/helpers/fileHelpers.js b/test/unit/bin/helpers/fileHelpers.js
@@ -1,8 +1,10 @@
-const chai = require("chai"),
-  sinon = require("sinon"),
+const chai = require('chai'),
+  sinon = require('sinon'),
   expect = chai.expect,
   assert = chai.assert,
-  chaiAsPromised = require("chai-as-promised");
+  chaiAsPromised = require('chai-as-promised'),
+  fs = require('fs-extra'),
+  fileHelpers = require('../../../../bin/helpers/fileHelpers');
 
 const logger = require("../../../../bin/helpers/logger").winstonLogger,
   proxyquire = require("proxyquire").noCallThru();
@@ -82,30 +84,19 @@ describe("fileHelpers", () => {
   });
 
   it("deleteZip returns 0 on success", () => {
-    let unlinkStub = sandbox.stub().yields();
-
-    const fileHelpers = proxyquire("../../../../bin/helpers/fileHelpers", {
-      "fs-extra": {
-        unlink: unlinkStub,
-      },
-    });
+    let unlinkStub = sinon.stub(fs, 'unlinkSync').returns(true);
 
     let result = fileHelpers.deleteZip();
     sinon.assert.calledOnce(unlinkStub);
     assert.equal(result, 0);
+    fs.unlinkSync.restore();
   });
 
   it("deleteZip returns 1 on failure", () => {
-    let unlinkStub = sandbox.stub().yields(new Error("random-error"));
-
-    const fileHelpers = proxyquire("../../../../bin/helpers/fileHelpers", {
-      "fs-extra": {
-        unlink: unlinkStub,
-      },
-    });
-
+    let unlinkStub = sinon.stub(fs, 'unlinkSync').yields(new Error("random-error"));
     let result = fileHelpers.deleteZip();
     sinon.assert.calledOnce(unlinkStub);
     assert.equal(result, 1);
+    fs.unlinkSync.restore();
   });
 });
diff --git a/test/unit/bin/helpers/sync/failedSpecDetails.js b/test/unit/bin/helpers/sync/failedSpecDetails.js
@@ -21,39 +21,41 @@ describe("failedSpecsDetails", () => {
   });
 
   context("data is empty", () => {
-    let data = [];
+    let data = {
+      specs: [],
+      exitCode: 0
+    };
+
     it('returns 0 exit code', () => {
-      return specDetails.failedSpecsDetails(data).then((status) => {
-        expect(status).to.equal(0);
+      return specDetails.failedSpecsDetails(data).then((result) => {
+        expect(result).to.equal(data);
       });
     });
   });
 
   context("data does not have failed specs", () => {
-    let data = [
-      {specName: 'spec2.name.js', status: 'Skipped', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'}
-    ];
+    let data = {
+      specs: [{specName: 'spec2.name.js', status: 'Skipped', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'}],
+      exitCode: 0
+    };
 
     it("returns 0 exit code", () => {
-      return specDetails.failedSpecsDetails(data).then((status) => {
-        expect(status).to.equal(0);
+      return specDetails.failedSpecsDetails(data).then((result) => {
+        expect(result).to.equal(data);
       });
     });
   });
 
   context("data has failed specs", () => {
-    let data = [
-      {specName: 'spec2.name.js', status: 'Failed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'},
-      {specName: 'spec2.name.js', status: 'Passed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'}
-    ];
+    let data = {
+      specs: [ {specName: 'spec2.name.js', status: 'Failed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'},
+      {specName: 'spec2.name.js', status: 'Passed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'}],
+      exitCode: 1
+    };
 
     it("returns 1 exit code", () => {
-      return specDetails.failedSpecsDetails(data)
-        .then((status) => {
-          chai.assert.equal(status, 1);
-          expect(status).to.equal(1);
-        }).catch((status) => {
-          expect(status).to.equal(1);
+      return specDetails.failedSpecsDetails(data).then((result) => {
+        expect(result).to.equal(data);
       });
     });
   });
diff --git a/test/unit/bin/helpers/sync/specSummary.js b/test/unit/bin/helpers/sync/specSummary.js
@@ -10,28 +10,33 @@ var specSummary = require('../../../../../bin/helpers/sync/specsSummary');
 
 describe("printSpecsRunSummary", () => {
   context("data is empty", () => {
-    let data = [], time = 6000, machines = 2;
+    let data = { specs: [], duration: 6000, exitCode: 0}, machines = 2;
     it('returns passed specs data', () => {
-      return specSummary.printSpecsRunSummary(data, time, machines).then((specsData) => {
-        expect(data).to.equal(specsData);
+      return specSummary.printSpecsRunSummary(data, machines).then((specsData) => {
+        expect(data.exitCode).to.equal(specsData);
       });
     });
   });
 
   context("with data", () => {
     let time = 6000,
         machines = 2,
-        data = [
+        specs = [
           {specName: 'spec2.name.js', status: 'Failed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'},
           {specName: 'spec2.name.js', status: 'Skipped', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'},
           {specName: 'spec2.name.js', status: 'Failed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'},
           {specName: 'spec2.name.js', status: 'Passed', combination: 'Win 10 / Chrome 78', sessionId: '3d3rdf3r...'}
-        ];
+        ],
+        data = {
+          specs: specs,
+          duration: time,
+          exitCode: 0
+        };
 
     it('returns passed specs data', () => {
       var loggerInfoSpy = sinon.spy(logger, 'info');
 
-      specSummary.printSpecsRunSummary(data, time, machines);
+      specSummary.printSpecsRunSummary(data, machines);
       sinon.assert.calledWith(loggerInfoSpy, 'Total tests: 4, passed: 1, failed: 2, skipped: 1');
       sinon.assert.calledWith(loggerInfoSpy, `Done in ${time / 1000} seconds using ${machines} machines\n`);
 
diff --git a/test/unit/bin/helpers/sync/syncSpecsLogs.js b/test/unit/bin/helpers/sync/syncSpecsLogs.js
@@ -29,13 +29,13 @@ describe("syncSpecsLogs", () => {
   context("getCombinationName", () => {
     const get_path = syncSpecsLogs.__get__("getCombinationName");;
     let spec = {
-      "os": "Windows 10",
+      "os": "Windows",
       "osVersion": "10",
       "browser": "chrome",
       "browserVersion": "86"
     }
     it("returns combination name", () => {
-      let expectedCombination = `${spec["os"]} ${spec["osVersion"]} / ${spec["browser"]} ${spec["browserVersion"]}`;
+      let expectedCombination = `Chrome 86 (Windows 10)`;
       expect(get_path(spec)).to.equal(expectedCombination);
     });
   });
@@ -61,15 +61,12 @@ describe("syncSpecsLogs", () => {
     const printInitialLog = syncSpecsLogs.__get__("printInitialLog");
 
     it("should print inital logs for specs in sync", () => {
-      var loggerInfoStub = sinon.stub(logger, 'info');
 
       printInitialLog()
 
       expect(syncSpecsLogs.__get__("n")).to.equal(Constants.syncCLI.INITIAL_DELAY_MULTIPLIER);
       expect(syncSpecsLogs.__get__("startTime")).to.not.be.null;
-      sinon.assert.calledWith(loggerInfoStub, Constants.syncCLI.LOGS.INIT_LOG);
 
-      loggerInfoStub.restore();
     });
   });
 
@@ -95,10 +92,12 @@ describe("syncSpecsLogs", () => {
       syncSpecsLogs.__set__('getBorderConfig', getBorderConfigStub);
 
       let options = getTableConfig();
-      expect(options.singleLine).to.be.true;
-      expect(options.columnDefault.width).to.equal(50);
-      expect(options.columns[0].alignment).to.equal('right');
-      expect(options.columnCount).to.equal(2);
+      expect(options.columnDefault.width).to.equal(25);
+      expect(options.columns[1].alignment).to.equal('center');
+      expect(options.columns[2].alignment).to.equal('left');
+      expect(options.columns[1].width).to.equal(1);
+      expect(options.columns[2].width).to.equal(30);
+      expect(options.columnCount).to.equal(3);
       expect(getBorderConfigStub.calledOnce).to.be.true;
     });
   });
@@ -108,8 +107,8 @@ describe("syncSpecsLogs", () => {
 
     it('should return proper border option for spec table', () => {
       let options = getBorderConfig();
-      expect(options.topBody).to.equal("-");
-      expect(options.bottomBody).to.equal("-");
+      expect(options.topBody).to.equal("");
+      expect(options.bottomBody).to.equal("");
     });
   });
 
@@ -122,7 +121,7 @@ describe("syncSpecsLogs", () => {
       syncSpecsLogs.__set__('stream', stream);
       let combination = "Windows 10", path = "path", status = "passed";
       writeToTable(combination, path, status);
-      sinon.assert.calledOnceWithExactly(stream.write, [combination + ":", `${path} ${status}`]);
+      sinon.assert.calledOnceWithExactly(stream.write, [combination , ":", `${path} ${status}`]);
     });
   });
 
@@ -200,7 +199,7 @@ describe("syncSpecsLogs", () => {
   context("printSpecsStatus", () => {
     const printSpecsStatus = syncSpecsLogs.__get__("printSpecsStatus");
     let startTime = Date.now(), endTime = Date.now() + 10, counter = 0;
-    let specSummary = { specs: [] }, getOptions, getTableConfig, tableStream, whileProcess, loggerInfoStub;
+    let specSummary = { specs: [] }, getOptions, getTableConfig, tableStream, whileProcess;
 
     beforeEach(() => {
       counter = 0;
@@ -214,8 +213,6 @@ describe("syncSpecsLogs", () => {
       tableStream = sandbox.stub();
       syncSpecsLogs.__set__('tableStream', tableStream);
 
-      loggerInfoStub = sandbox.stub(logger, 'info');
-
       whileProcess = sandbox.stub().callsFake(function (whilstCallback) {
         counter++
         if(counter >= 3) {
@@ -237,7 +234,6 @@ describe("syncSpecsLogs", () => {
         expect(getOptions.calledOnce).to.be.true;
         expect(getTableConfig.calledOnce).to.be.true;
         expect(tableStream.calledOnce).to.be.true;
-        expect(loggerInfoStub.calledOnce).to.be.true;
         expect(whileProcess.calledOnce).to.be.false;
         expect(specSummary.specs).deep.to.equal([])
         expect(specSummary.duration).to.eql(endTime - startTime);
diff --git a/test/unit/bin/helpers/utils.js b/test/unit/bin/helpers/utils.js
@@ -931,4 +931,16 @@ describe('utils', () => {
       expect(utils.isUndefined(bsConfig.auth)).to.be.true;
     });
   });
+
+  describe('capitalizeFirstLetter', () => {
+
+    it('should capitalize First Letter ', () => {
+      expect(utils.capitalizeFirstLetter("chrome")).to.eq("Chrome");
+    });
+
+    it('should return null if value passed is null', () => {
+      expect(utils.capitalizeFirstLetter(null)).to.eq(null);
+    });
+
+  });
 });
diff --git a/test/unit/bin/helpers/zipUpload.js b/test/unit/bin/helpers/zipUpload.js
@@ -22,6 +22,7 @@ describe("zipUpload", () => {
     sandbox = sinon.createSandbox();
     getUserAgentStub = sandbox.stub().returns("random user-agent");
     createReadStreamStub = sandbox.stub(fs, "createReadStream");
+    deleteZipStub = sandbox.stub().returns(true);
   });
 
   afterEach(() => {
@@ -119,11 +120,14 @@ describe("zipUpload", () => {
       .stub(request, "post")
       .yields(null, { statusCode: 200 }, JSON.stringify({ zip_url: zip_url }));
 
-    const zipUploader = proxyquire("../../../../bin/helpers/zipUpload", {
-      "./utils": {
+    const zipUploader = proxyquire('../../../../bin/helpers/zipUpload', {
+      './utils': {
         getUserAgent: getUserAgentStub,
       },
-      request: { post: requestStub },
+      request: {post: requestStub},
+      './fileHelpers': {
+        deleteZip: deleteZipStub,
+      },
     });
 
     return zipUploader
@@ -132,6 +136,7 @@ describe("zipUpload", () => {
         sinon.assert.calledOnce(requestStub);
         sinon.assert.calledOnce(getUserAgentStub);
         sinon.assert.calledOnce(createReadStreamStub);
+        sinon.assert.calledOnce(deleteZipStub);
         chai.assert.equal(data.zip_url, zip_url);
       })
       .catch((error) => {
