feat(choices): Use choices order from conventional-changelog-metahub

pvdlg · Aug 27, 2017 · 51948e5 · 51948e5
1 parent db1fe93
commit 51948e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/questions.js b/src/questions.js
@@ -1,4 +1,5 @@
 import {map, padEnd, maxBy} from 'lodash';
+import {typesOrder} from 'conventional-changelog-metahub/types';
 
 /**
  * Create the Inquirer.js questions object.
@@ -23,7 +24,7 @@ export default function questions(options, config) {
   const choices = map(allTypes, (type, key) => ({
     name: `${padEnd(`${key}:`, length)} ${type.emoji}  ${type.description}`,
     value: key,
-  }));
+  })).sort((choice1, choice2) => (typesOrder.indexOf(choice1.value) < typesOrder.indexOf(choice2.value) ? -1 : 1));
 
   return [
     {type: 'list', name: 'type', message: "Select the type of change that you're committing:", choices},

diff --git a/test/questions.test.js b/test/questions.test.js
@@ -1,5 +1,5 @@
 import test from 'ava';
-import {types} from 'conventional-changelog-metahub/types';
+import {types, typesOrder} from 'conventional-changelog-metahub/types';
 import aliases from 'conventional-changelog-metahub/aliases';
 import questions from '../lib/questions';
 
@@ -86,3 +86,9 @@ test('Choices of type question are formatted properly (description of each choic
     }
   });
 });
+
+test('Choices are ordered based on ', t => {
+  questions({types, aliases}, config)[qOrder.indexOf('type')].choices.forEach((choice, index) => {
+    t.is(typesOrder.indexOf(choice.value), index);
+  });
+});