Change options and args order (#1063)

* change args and options order * update help tests
yeoman · Mar 26, 2018 · efc52c9 · efc52c9
1 parent e582a00
commit efc52c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/actions/help.js b/lib/actions/help.js
@@ -70,11 +70,11 @@ help.usage = function () {
   let args = '';
 
   if (this._arguments.length > 0) {
-    args = this._arguments.map(formatArg).join(' ');
+    args = this._arguments.map(formatArg).join(' ') + ' ';
   }
 
   name = name.replace(/^yeoman:/, '');
-  let out = `yo ${name} ${options} ${args}`;
+  let out = `yo ${name} ${args}${options}`;
 
   if (this.description) {
     out += '\n\n' + this.description;

diff --git a/test/base.js b/test/base.js
@@ -845,7 +845,7 @@ describe('Base', () => {
       const help = this.dummy.help();
       const expected = [
         'Usage:',
-        'yo dummy [options] [<baz>]',
+        'yo dummy [<baz>] [options]',
         '',
         'A new desc for this generator',
         '',
@@ -876,7 +876,7 @@ describe('Base', () => {
       });
 
       const usage = this.dummy.usage();
-      assert.equal(usage.trim(), 'yo dummy [options] [<baz>]');
+      assert.equal(usage.trim(), 'yo dummy [<baz>] [options]');
     });
 
     it('returns the expected usage output without arguments', function () {