Allow passing arguments to a Generator constructor in the same way as…

… we pass options
yeoman · Dec 2, 2016 · a852f62 · a852f62
1 parent f6f4dda
commit a852f62
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -318,7 +318,9 @@ Base.prototype.parseOptions = function () {
   this._arguments.forEach(function (config, index) {
     var value;
     if (index >= parsedOpts._.length) {
-      if ('default' in config) {
+      if (config.name in this.options) {
+        value = this.options[config.name];
+      } else if ('default' in config) {
         value = config.default;
       } else {
         return;
@@ -332,7 +334,7 @@ Base.prototype.parseOptions = function () {
     }
 
     parsedOpts[config.name] = value;
-  });
+  }.bind(this));
 
   // Make the parsed options available to the instance
   _.extend(this.options, parsedOpts);

diff --git a/test/base.js b/test/base.js
@@ -554,6 +554,58 @@ describe('Base', function () {
       assert.equal(this.dummy.options.foo, 'bar');
     });
 
+    it('allows specifying default argument values', function () {
+      var Generator = Base.extend({
+        constructor: function () {
+          Base.apply(this, arguments);
+
+          this.argument('bar', {default: 'baz'});
+        }
+      });
+
+      var gen = new Generator({
+        env: this.env,
+        resolved: 'test'
+      });
+
+      assert.equal(gen.options.bar, 'baz');
+    });
+
+    it('allows specifying default argument values', function () {
+      var Generator = Base.extend({
+        constructor: function () {
+          Base.apply(this, arguments);
+
+          this.argument('bar', {default: 'baz'});
+        }
+      });
+
+      var gen = new Generator({
+        env: this.env,
+        resolved: 'test'
+      });
+
+      assert.equal(gen.options.bar, 'baz');
+    });
+
+    it('properly uses arguments values passed from constructor', function () {
+      var Generator = Base.extend({
+        constructor: function () {
+          Base.apply(this, arguments);
+
+          this.argument('bar', {default: 'baz'});
+        }
+      });
+
+      var gen = new Generator({
+        env: this.env,
+        resolved: 'test',
+        bar: 'foo'
+      });
+
+      assert.equal(gen.options.bar, 'foo');
+    });
+
     it('slice positional arguments when config.type is Array', function () {
       this.dummy.argument('bar', { type: Array });
       assert.deepEqual(this.dummy.options.bar, ['bar', 'baz', 'bom']);