diff --git a/.npmignore b/.npmignore index a8c4022..5c6173f 100644 --- a/.npmignore +++ b/.npmignore @@ -10,4 +10,5 @@ Gruntfile.js /node_modules /tsd-cache /test +/tmp /*.tgz diff --git a/Gruntfile.js b/Gruntfile.js index a2fd415..cb4ff07 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -83,8 +83,6 @@ module.exports = function (grunt) { command: 'reinstall', latest: true, opts: { - saveToConfig: true, - resolveDependencies: true } } }, ['pass']); diff --git a/lib/runner.js b/lib/runner.js index c3f6f2b..a69d3fc 100644 --- a/lib/runner.js +++ b/lib/runner.js @@ -19,6 +19,9 @@ function getRunner(grunt) { return api.readConfig(options.config, (!!options.config)).then(function () { var opts = tsd.Options.fromJSON(options.opts); + opts.overwriteFiles = true; + opts.resolveDependencies = true; + opts.saveToConfig = true; if (options.latest) { var query = new tsd.Query(); @@ -29,8 +32,6 @@ function getRunner(grunt) { query.versionMatcher = new tsd.VersionMatcher('latest'); return api.select(query, opts).then(function (selection) { - opts.overwrite = true; - opts.saveToConfig = true; return api.install(selection, opts); }); } diff --git a/package.json b/package.json index 5cfdac7..f3ce96d 100644 --- a/package.json +++ b/package.json @@ -44,11 +44,9 @@ "grunt-contrib-clean": "~0.5.0", "grunt-contrib-jshint": "~0.7.2", "jshint-path-reporter": "0.1", - "chai": "git://github.com/Bartvds/chai/#fixes/1.8.x", - "chai-fs": "0.0.1", + "chai": "~1.9.1", "grunt-continue": "0.0.1", "grunt-contrib-copy": "~0.4.1", - "difflet": "~0.2.6", "unfunk-diff": "0.0.1" }, "peerDependencies": { diff --git a/test/helper.js b/test/helper.js index 8aefa60..b590401 100644 --- a/test/helper.js +++ b/test/helper.js @@ -9,34 +9,6 @@ var differ = require('unfunk-diff'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -//for safety -function promiseDoneMistake() { - throw new Error('don\'t use a done() callback when using eventually()'); -} - -function patchEventually(word) { - word.eventually = function eventually(expectation, assertion) { - word(expectation, function (done) { - Q(assertion(promiseDoneMistake)).done(function () { - done(); - }, function (err) { - done(err); - }); - }); - }; -} - -//monkey patch -if (typeof it !== 'undefined') { - patchEventually(it); - patchEventually(before); - patchEventually(beforeEach); - patchEventually(after); - patchEventually(afterEach); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - function testName(filename) { return path.basename(path.dirname(filename)) + '/' + path.basename(filename); }