Skip to content

Commit

Permalink
More dependencies upgrade (#256)
Browse files Browse the repository at this point in the history
* aws-sdk upgrade

* Updated detective

* Upgrade accept-language-parser

* Upgraded clean-css

* Update node-dir

* Upgrade uglify-js

* update semver

* Parse author
  • Loading branch information
matteofigus authored and jwhayes committed Jun 28, 2016
1 parent a3325c7 commit 8d629da
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 129 deletions.
156 changes: 39 additions & 117 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"sinon": "1.14.1"
},
"dependencies": {
"accept-language-parser": "1.1.0",
"accept-language-parser": "^1.1.2",
"async": "1.5.2",
"aws-sdk": "2.3.14",
"clean-css": "3.4.9",
"aws-sdk": "^2.4.2",
"clean-css": "^3.4.18",
"colors": "1.1.2",
"dependency-graph": "0.4.1",
"detective": "4.0.0",
"detective": "^4.3.1",
"express": "3.21.2",
"falafel": "1.2.0",
"form-data": "0.1.4",
Expand All @@ -64,17 +64,17 @@
"minimal-request": "2.0.0",
"multer": "0.1.4",
"nice-cache": "0.0.5",
"node-dir": "0.1.12",
"node-dir": "^0.1.14",
"nomnom": "1.8.1",
"npm": "3.10.2",
"omelette": "0.3.1",
"opn": "1.0.1",
"parse-author": "0.2.1",
"parse-author": "^1.0.0",
"read": "1.0.7",
"semver": "5.1.0",
"semver": "^5.1.1",
"stringformat": "0.0.5",
"tar.gz": "1.0.5",
"uglify-js": "2.6.2",
"uglify-js": "^2.6.4",
"underscore": "1.8.3",
"watch": "0.13.0"
}
Expand Down
8 changes: 4 additions & 4 deletions test/unit/cli-domain-package-server-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('cli : domain : package-server-script', function(){
});

it('should throw an error with error details', function(){
expect(error.toString()).to.equal('Error: Javascript error found in myserver.js [3,19]: Unexpected token punc «;», expected punc «,»]');
expect(error.toString()).to.equal('Error: Javascript error found in myserver.js [3,19]: SyntaxError: Unexpected token punc «;», expected punc «,»]');
});
});

Expand Down Expand Up @@ -245,15 +245,15 @@ describe('cli : domain : package-server-script', function(){
});

it('should wrap the while loop with an iterator limit (and convert it to a for loop)', function(){
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var r,a,t,i=1e9;;){if(0>=i)throw new Error(\"loop exceeded maximum allowed iterations\");r=234,i--}');
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var r,a,t,i=1e9;;){if(i<=0)throw new Error(\"loop exceeded maximum allowed iterations\");r=234,i--}');
});

it('should wrap the for loop with an iterator limit', function(){
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var i=1e9;;){if(0>=i)throw new Error(\"loop exceeded maximum allowed iterations\");a=546,i--}');
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var i=1e9;;){if(i<=0)throw new Error(\"loop exceeded maximum allowed iterations\");a=546,i--}');
});

it('should wrap the do loop with an iterator limit (and convert it to a for loop)', function(){
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var i=1e9;;){if(0>=i)throw new Error(\"loop exceeded maximum allowed iterations\");t=342,i--}');
expect(fsMock.writeFile.firstCall.args[1]).to.contain('for(var i=1e9;;){if(i<=0)throw new Error(\"loop exceeded maximum allowed iterations\");t=342,i--}');
});
});
});
Expand Down

0 comments on commit 8d629da

Please sign in to comment.