Merge branch 'master' of github.com:twitter/bower

This commit is contained in:
André Cruz
2013-02-06 20:50:07 +00:00
2 changed files with 4 additions and 4 deletions

View File

@@ -14,8 +14,8 @@ var config = require('../core/config');
function save(manager) {
// Wait for the resolve event and then for the load json event
manager.on('resolve', function () {
manager.on('loadJSON', function () {
manager.on('resolve', function (resolved) {
if (resolved) manager.on('loadJSON', function () {
manager.json.dependencies = manager.json.dependencies || {};
// Only include the root packages

View File

@@ -37,10 +37,10 @@
},
"scripts": {
"postinstall": "node cleanup",
"test": "mocha -R spec -t 20000"
"test": "mocha --reporter spec --timeout 40000"
},
"devDependencies": {
"mocha": "~1.6.0",
"mocha": "~1.8.1",
"nock": "~0.13.5"
},
"bin": {