Merge pull request #5 from commitizen/lu-inquirer

Depend directly on inquirer

Author: LinusU

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - '6'
+  - '4'
+  - '0.12'
+  - '0.10'

index.js

@@ -1,3 +1,5 @@
+var inquirer = require('inquirer')
+
 // This can be any kind of SystemJS compatible module.
 // We use Commonjs here, but ES6 or AMD would do just
 // fine.
@@ -23,7 +25,7 @@ function prompter(cz, commit) {
   // See inquirer.js docs for specifics.
   // You can also opt to use another input
   // collection library if you prefer.
-  cz.prompt([
+  inquirer.prompt([
     {
       type: 'input',
       name: 'message',

index.test.js

@@ -1,71 +1,62 @@
 import sinon from 'sinon';
 import chai from 'chai';
 import sinonChai from 'sinon-chai';
-import {prompter} from './index';
+import proxyquire from 'proxyquire';
 
 const {expect} = chai;
 chai.use(sinonChai);
 
 describe(`prompter`, () => {
-  let cz, commit;
-  beforeEach(() => {
-    cz = {prompt: sinon.spy()};
+  let inquirer, commit, prompter, commitAnswers;
+
+  before(() => {
     commit = sinon.spy();
+    inquirer = {prompt: sinon.spy()};
+    prompter = proxyquire('./', {inquirer}).prompter;
   });
 
-  it(`call cz.prompt`, () => {
-    prompter(cz);
-    expect(cz.prompt).to.have.been.calledWith(sinon.match.array, sinon.match.func);
+  beforeEach(() => {
+    prompter(null, commit);
+    commitAnswers = inquirer.prompt.getCall(0).args[1];
   });
 
-  describe(`commitAnswers`, () => {
-    let commitAnswers;
-    beforeEach(() => {
-      prompter(cz, commit);
-      commitAnswers = cz.prompt.getCall(0).args[1];
-    });
+  it(`should call commit with the proper message`, () => {
+    const message = 'sample commit message';
+    const issues = 'CZ-234 CZ-235';
+    const workflow = 'closed';
+    const time = '3y 2w 7d 8h 30m';
+    const comment = 'This took waaaaay too long';
+    commitAnswers({message, issues, workflow, time, comment});
+    expect(commit).to.have.been.calledWith([
+      message,
+      issues,
+      `#${workflow}`,
+      `#time ${time}`,
+      `#comment ${comment}`
+    ].join(' '));
+  });
 
-    it(`should call commit with the proper message`, () => {
+  ['workflow', 'time', 'comment'].forEach((item) => {
+    it(`should just leave off ${item} if it's not specified`, () => {
       const message = 'sample commit message';
       const issues = 'CZ-234 CZ-235';
       const workflow = 'closed';
       const time = '3y 2w 7d 8h 30m';
       const comment = 'This took waaaaay too long';
-      commitAnswers({message, issues, workflow, time, comment});
-      expect(commit).to.have.been.calledWith([
+      const answers = {message, issues, workflow, time, comment};
+      delete answers[item];
+      commitAnswers(answers);
+      expect(commit).to.have.been.calledWith(filter([
         message,
         issues,
-        `#${workflow}`,
-        `#time ${time}`,
-        `#comment ${comment}`
-      ].join(' '));
+        item !== 'workflow' ? `#${workflow}` : undefined,
+        item !== 'time' ? `#time ${time}` : undefined,
+        item !== 'comment' ? `#comment ${comment}` : undefined
+      ]).join(' '));
     });
-
-    ['workflow', 'time', 'comment'].forEach((item) => {
-      it(`should just leave off ${item} if it's not specified`, () => {
-        const message = 'sample commit message';
-        const issues = 'CZ-234 CZ-235';
-        const workflow = 'closed';
-        const time = '3y 2w 7d 8h 30m';
-        const comment = 'This took waaaaay too long';
-        const answers = {message, issues, workflow, time, comment};
-        delete answers[item];
-        commitAnswers(answers);
-        expect(commit).to.have.been.calledWith(filter([
-          message,
-          issues,
-          item !== 'workflow' ? `#${workflow}` : undefined,
-          item !== 'time' ? `#time ${time}` : undefined,
-          item !== 'comment' ? `#comment ${comment}` : undefined
-        ]).join(' '));
-      });
-    })
   });
-
 });
 
 function filter(array) {
-  return array.filter(function(item) {
-    return !!item;
-  });
+  return array.filter(Boolean);
 }

package.json

@@ -34,8 +34,12 @@
     "chai": "3.2.0",
     "mocha": "2.2.5",
     "nodemon": "1.4.0",
+    "proxyquire": "^1.7.10",
     "sinon": "1.15.4",
     "sinon-chai": "2.8.0",
     "with-package": "0.2.0"
+  },
+  "dependencies": {
+    "inquirer": "^1.1.3"
   }
 }