Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update "init"-command for use with node 6+
- Add "thought" as dev-dependency instead of global install - Omit "thoughtcheck", since node@6 ships with npm>2.14 already - Tests for all
- Loading branch information
Showing
3 changed files
with
197 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| /*! | ||
| * thought <https://github.com/nknapp/thought> | ||
| * | ||
| * Copyright (c) 2015 Nils Knappmeier. | ||
| * Released under the MIT license. | ||
| */ | ||
|
|
||
| /* eslint-env mocha */ | ||
|
|
||
| 'use strict' | ||
|
|
||
| var Scenario = require('./lib/scenarios') | ||
| var init = require('../lib/init') | ||
| var bluebird = require('bluebird') | ||
| var simpleGit = require('simple-git') | ||
|
|
||
| var chai = require('chai') | ||
| chai.use(require('chai-as-promised')) | ||
| chai.use(require('dirty-chai')) | ||
|
|
||
| var qfs = require('m-io/fs') | ||
|
|
||
| var expect = chai.expect | ||
|
|
||
| describe('The "init" option', function () { | ||
| this.timeout(15000) | ||
| it('should add scripts and devDependency to package.json', function () { | ||
| var scenario = new Scenario('simple-project').withTmpDir('test-output/thought-init1') | ||
| return scenario.prepareAndRun(() => { | ||
| var git = bluebird.promisifyAll(simpleGit(scenario.actual)) | ||
|
|
||
| return git.initAsync() | ||
| .then(() => git.addAsync('package.json')) | ||
| .then(() => git.commitAsync('Initial checkin')) | ||
| .then(() => qfs.write('.gitignore', 'node_modules')) | ||
| .then(() => init()) | ||
| .then(() => git.logAsync()) | ||
| // Check only which files have been added to the index | ||
| .then(log => expect(log.latest.message, 'package.json must have been committed').to.equal('[Thought] Added scripts to run thought on version-bumps (HEAD -> master)')) | ||
| .then(() => qfs.read('package.json')) | ||
| .then(pkgJson => expect(JSON.parse(pkgJson), 'Checking package.json').to.deep.equals({ | ||
| 'author': '', | ||
| 'description': 'A simple description', | ||
| 'devDependencies': { | ||
| 'fs-walker': '^1.0.0', | ||
| 'thought': '^' + require('../package.json').version | ||
| }, | ||
| 'license': 'ISC', | ||
| 'main': 'index.js', | ||
| 'name': 'simple-project', | ||
| 'repository': { | ||
| 'type': 'git', | ||
| 'url': 'https://github.com/unit-test/simple-project.git' | ||
| }, | ||
| 'scripts': { | ||
| 'test': 'echo "Error: no test specified" && exit 1', | ||
| 'thought': 'thought run -a', | ||
| 'version': 'npm run thought' | ||
| }, | ||
| 'version': '1.0.0' | ||
| })) | ||
| .then(() => expect(qfs.exists('node_modules/thought'), 'Thought dependency must be installed').to.be.ok()) | ||
| }) | ||
| }) | ||
|
|
||
| it('should add scripts and devDependency to package.json (even if no scripts-property exists', function () { | ||
| var scenario = new Scenario('simple-project').withTmpDir('test-output/thought-init1') | ||
| return scenario.prepareAndRun(() => { | ||
| var git = bluebird.promisifyAll(simpleGit(scenario.actual)) | ||
|
|
||
| return git.initAsync() | ||
| .then(() => qfs.read('package.json')) | ||
| .then(JSON.parse) | ||
| .then((pkgJson) => { | ||
| delete pkgJson.scripts | ||
| return qfs.write('package.json', JSON.stringify(pkgJson)) | ||
| }) | ||
| .then(() => git.addAsync('package.json')) | ||
| .then(() => git.commitAsync('Initial checkin')) | ||
| .then(() => qfs.write('.gitignore', 'node_modules')) | ||
| .then(() => init()) | ||
| .then(() => git.logAsync()) | ||
| // Check only which files have been added to the index | ||
| .then(log => expect(log.latest.message, 'package.json must have been committed').to.equal('[Thought] Added scripts to run thought on version-bumps (HEAD -> master)')) | ||
| .then(() => qfs.read('package.json')) | ||
| .then(pkgJson => expect(JSON.parse(pkgJson), 'Checking package.json').to.deep.equals({ | ||
| 'author': '', | ||
| 'description': 'A simple description', | ||
| 'devDependencies': { | ||
| 'fs-walker': '^1.0.0', | ||
| 'thought': '^' + require('../package.json').version | ||
| }, | ||
| 'license': 'ISC', | ||
| 'main': 'index.js', | ||
| 'name': 'simple-project', | ||
| 'repository': { | ||
| 'type': 'git', | ||
| 'url': 'https://github.com/unit-test/simple-project.git' | ||
| }, | ||
| 'scripts': { | ||
| 'thought': 'thought run -a', | ||
| 'version': 'npm run thought' | ||
| }, | ||
| 'version': '1.0.0' | ||
| })) | ||
| .then(() => expect(qfs.exists('node_modules/thought'), 'Thought dependency must be installed').to.be.ok()) | ||
| }) | ||
| }) | ||
|
|
||
| it('should throw an exception, if the package.json-file has uncommitted changes', function () { | ||
| var scenario = new Scenario('simple-project').withTmpDir('test-output/thought-init2') | ||
| return scenario.prepareAndRun(() => { | ||
| var git = bluebird.promisifyAll(simpleGit(scenario.actual)) | ||
| return git.initAsync() | ||
| .then(() => expect(init()).to.be.rejectedWith(/package.json has changes/)) | ||
| }) | ||
| }) | ||
|
|
||
| it('should throw an exception, if Thought is already registered in a script', function () { | ||
| var scenario = new Scenario('simple-project').withTmpDir('test-output/thought-init2') | ||
| return scenario.prepareAndRun(() => { | ||
| var git = bluebird.promisifyAll(simpleGit(scenario.actual)) | ||
|
|
||
| return git.initAsync() | ||
| .then(() => qfs.read('package.json')) | ||
|
|
||
| .then(JSON.parse) | ||
| .then((pkgJson) => { | ||
| pkgJson.scripts.thought = 'thought run -a' | ||
| return qfs.write('package.json', JSON.stringify(pkgJson)) | ||
| }) | ||
| .then(() => git.addAsync('package.json')) | ||
| .then(() => git.commitAsync('Initial checkin')) | ||
| .then(() => expect(init()).to.be.rejectedWith(/scripts are already in your package.json/)) | ||
| }) | ||
| }) | ||
|
|
||
| it('should prepend the version script, if it already exists', function () { | ||
| var scenario = new Scenario('simple-project').withTmpDir('test-output/thought-init2') | ||
| return scenario.prepareAndRun(() => { | ||
| var git = bluebird.promisifyAll(simpleGit(scenario.actual)) | ||
|
|
||
| return git.initAsync() | ||
| .then(() => qfs.read('package.json')) | ||
|
|
||
| .then(JSON.parse) | ||
| .then((pkgJson) => { | ||
| pkgJson.scripts.version = 'run something' | ||
| return qfs.write('package.json', JSON.stringify(pkgJson)) | ||
| }) | ||
| .then(() => git.addAsync('package.json')) | ||
| .then(() => git.commitAsync('Initial checkin')) | ||
| .then(() => init()) | ||
| .then(() => qfs.read('package.json')) | ||
| .then(JSON.parse) | ||
| .then((pkgJson) => expect(pkgJson.scripts.version).to.equal('npm run thought && run something')) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /*! | ||
| * thought <https://github.com/nknapp/thought> | ||
| * | ||
| * Copyright (c) 2015 Nils Knappmeier. | ||
| * Released under the MIT license. | ||
| */ | ||
|
|
||
| /* eslint-env mocha */ | ||
|
|
||
| 'use strict' | ||
|
|
||
| var chai = require('chai') | ||
| chai.use(require('chai-as-promised')) | ||
| chai.use(require('dirty-chai')) | ||
| var expect = chai.expect | ||
|
|
||
| describe('The "exeq" utility', function () { | ||
| var exec = require('../lib/utils/exeq') | ||
| this.timeout(10000) | ||
| it('should return stdout and stderr', function () { | ||
| return expect(exec(process.argv[0], ['-e', 'console.log("123");console.error("abc")'])) | ||
| .to.eventually.deep.equal(['123\n', 'abc\n']) | ||
| }) | ||
|
|
||
| it('should throw an error on exit-code > 0', function () { | ||
| return expect(exec(process.argv[0], ['-e', 'throw "Hommingberg"'])) | ||
| .to.rejectedWith(/Command failed:.*Hommingberg/) | ||
| }) | ||
| }) |