Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More dependencies upgrade #256

Merged
merged 8 commits into from
Jun 28, 2016
Merged

More dependencies upgrade #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
754d428
aws-sdk upgrade
matteofigus Jun 28, 2016
f7daa0b
Updated detective
matteofigus Jun 28, 2016
adc4fdd
Upgrade accept-language-parser
matteofigus Jun 28, 2016
9a1ffb6
Upgraded clean-css
matteofigus Jun 28, 2016
dcff046
Update node-dir
matteofigus Jun 28, 2016
6a10cc8
Upgrade uglify-js
matteofigus Jun 28, 2016
bd262a7
update semver
matteofigus Jun 28, 2016
9202bc3
Parse author
matteofigus Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 39 additions & 117 deletions npm-shrinkwrap.json
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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