Merge branch 'AFD-1923-fix-spec-pattern-and-lls' into AFD-1921-use-default-port-cypress

Author: prajwaldhawarikar-bs

bin/commands/runs.js

@@ -99,7 +99,7 @@ module.exports = function run(args, rawArgs) {
     // set the no-wrap
     utils.setNoWrap(bsConfig, args);
 
-    await packageInstaller.packageSetupAndInstaller(bsConfig, config.packageDirName, {markBlockStart, markBlockEnd});
+    const { packagesInstalled } = await packageInstaller.packageSetupAndInstaller(bsConfig, config.packageDirName, {markBlockStart, markBlockEnd});
 
     // set build tag caps
     utils.setBuildTags(bsConfig, args);
@@ -155,7 +155,7 @@ module.exports = function run(args, rawArgs) {
 
         logger.debug("Started caching npm dependencies.");
         markBlockStart('zip.packageInstaller');
-        return packageInstaller.packageWrapper(bsConfig, config.packageDirName, config.packageFileName, md5data, {markBlockStart, markBlockEnd}).then(function (packageData) {
+        return packageInstaller.packageWrapper(bsConfig, config.packageDirName, config.packageFileName, md5data, {markBlockStart, markBlockEnd}, packagesInstalled).then(function (packageData) {
           logger.debug("Completed caching npm dependencies.")
           markBlockEnd('zip.packageInstaller');
 

bin/helpers/packageInstaller.js

@@ -157,11 +157,15 @@ const packageSetupAndInstaller = (bsConfig, packageDir, instrumentBlocks) => {
   })
 }
 
-const packageWrapper = (bsConfig, packageDir, packageFile, md5data, instrumentBlocks) => {
+const packageWrapper = (bsConfig, packageDir, packageFile, md5data, instrumentBlocks, packagesInstalled) => {
   return new Promise(function (resolve) {
     let obj = {
       packageArchieveCreated: false
     };
+    if (!packagesInstalled) {
+      logger.debug("Skipping the caching of npm packages since package installed failed")
+      return resolve(obj);
+    }
     if (md5data.packageUrlPresent || !utils.isTrueString(bsConfig.run_settings.cache_dependencies)) {
       logger.debug("Skipping the caching of npm packages since BrowserStack has already cached your npm dependencies that have not changed since the last run.")
       return resolve(obj);

test/unit/bin/helpers/packageInstaller.js

@@ -505,7 +505,7 @@ describe("packageInstaller", () => {
         markBlockStart: sinon.stub(),
         markBlockEnd: sinon.stub()
       }
-      return packageWrapperrewire(bsConfig, packageDir, packageFile, md5data, instrumentBlocks)
+      return packageWrapperrewire(bsConfig, packageDir, packageFile, md5data, instrumentBlocks, true)
         .then((data) => {
           chai.assert.deepEqual(data, {packageArchieveCreated: true});
         })
@@ -530,13 +530,34 @@ describe("packageInstaller", () => {
         markBlockStart: sinon.stub(),
         markBlockEnd: sinon.stub()
       }
-      return packageWrapperrewire(bsConfig, packageDir, packageFile, md5data, instrumentBlocks)
+      return packageWrapperrewire(bsConfig, packageDir, packageFile, md5data, instrumentBlocks, true)
         .then((data) => {
           chai.assert.deepEqual(data, { packageArchieveCreated: false, error: 'test error stack' });
         })
         .catch((_error) => {
           chai.assert.fail("Promise error");
         });
     });
+
+    it("should reject with if issue in package install failed", () => {
+      let packageWrapperrewire = packageInstaller.__get__('packageWrapper');
+      let bsConfig = {
+        run_settings: {
+          cache_dependencies: true
+        }
+      };
+      let md5data = {};
+      let instrumentBlocks = {
+        markBlockStart: sinon.stub(),
+        markBlockEnd: sinon.stub()
+      }
+      return packageWrapperrewire(bsConfig, packageDir, packageFile, md5data, instrumentBlocks, false)
+        .then((data) => {
+          chai.assert.deepEqual(data, { packageArchieveCreated: false });
+        })
+        .catch((_error) => {
+          chai.assert.fail("Promise error");
+        });
+    });
   });
 });