Skip any install script when --skip-install is passed

Fix #745
yeoman · Mar 30, 2015 · 9ff2988 · 9ff2988
1 parent 1d6db5a
commit 9ff2988
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/lib/actions/install.js b/lib/actions/install.js
@@ -34,6 +34,12 @@ install.runInstall = function (installer, paths, options, cb) {
 
   var args = ['install'].concat(paths).concat(dargs(options));
 
+  // Return early if we're skipping installation.
+  if (this.options.skipInstall) {
+    cb();
+    return this;
+  }
+
   this.env.runLoop.add('install', function (done) {
     this.emit(installer + 'Install', paths);
     this.spawnCommand(installer, args, options)
@@ -123,10 +129,6 @@ install.installDependencies = function (options) {
     })));
   }
 
-  if (options.skipInstall) {
-    return options.callback();
-  }
-
   async.parallel(commands, options.callback);
 };
 

diff --git a/test/install.js b/test/install.js
@@ -47,6 +47,33 @@ describe('generators.Base (actions/install mixin)', function () {
         done();
       }.bind(this));
     });
+
+    describe('with --skip-install', function () {
+      beforeEach(function () {
+        this.dummy = this.env.create('dummy', {
+          options: {
+            skipInstall: true
+          }
+        });
+      });
+
+      it('does not spawn anything with skipInstall', function (done) {
+        this.dummy.runInstall('npm', ['install']);
+        this.dummy.run(function () {
+          sinon.assert.notCalled(this.spawnCommandStub);
+          done();
+        }.bind(this));
+      });
+
+      it('call callback if skipInstall', function (done) {
+        var spy = sinon.spy();
+        this.dummy.runInstall('npm', ['install'], spy);
+        this.dummy.run(function () {
+          sinon.assert.calledOnce(spy);
+          done();
+        });
+      });
+    });
   });
 
   describe('#bowerInstall()', function () {
@@ -114,19 +141,6 @@ describe('generators.Base (actions/install mixin)', function () {
       this.dummy.run();
     });
 
-    it('does not spawn anything with skipInstall', function (done) {
-      this.dummy.installDependencies({ skipInstall: true });
-      this.dummy.run(function () {
-        sinon.assert.notCalled(this.spawnCommandStub);
-        done();
-      }.bind(this));
-    });
-
-    it('call callback if skipInstall', function (done) {
-      this.dummy.installDependencies({ skipInstall: true, callback: done });
-      this.dummy.run();
-    });
-
     it('execute a callback after installs', function (done) {
       this.dummy.installDependencies({ callback: done });
       this.dummy.run();