Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanjudis committed Jan 8, 2017
1 parent 29a84be commit d8c7a75
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 31 deletions.
5 changes: 0 additions & 5 deletions .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,5 @@
"requireSpacesInsideArrayBrackets": "all",
"requireSpacesInsideObjectBrackets" : "all",

"validateJSDoc": {
"checkParamNames": true,
"checkRedundantParams": true,
"requireParamTypes": true
},
"validateQuoteMarks": "'"
}
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"latedef": false,
"newcap": true,
"noarg": true,
"sub": true,
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: node_js
node_js:
- "0.10"
- "4"
- "6"
- "7"

branches:
only:
Expand Down
36 changes: 19 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,27 @@
],
"main": "Gruntfile.js",
"engines": {
"node": ">= 0.8.0"
"node": ">= 4.0.0"
},
"scripts": {
"grunt": "grunt",
"test": "grunt test",
"coveralls": "jscoverage tasks/lib/phantomas.js && PHANTOMAS_COV=1 nodeunit --reporter=lcov test/lib/phantomasTest.js | coveralls"
},
"devDependencies": {
"coveralls": "~2.11.0",
"grunt": "^0.4.5",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compass": "~0.9.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-nodeunit": "~0.4.0",
"grunt-contrib-uglify": "~0.5.0",
"grunt-contrib-watch": "~0.6.0",
"grunt-jscs": "^0.7.1",
"jscoverage": "~0.5.0-rc1",
"nodeunit": "~0.9.0"
"grunt": "^1.0.1",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "~1.0.0",
"grunt-contrib-compass": "~1.1.1",
"grunt-contrib-copy": "~1.0.0",
"grunt-contrib-jshint": "~1.1.0",
"grunt-contrib-nodeunit": "~1.0.0",
"grunt-contrib-uglify": "~2.0.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-jscs": "^3.0.1",
"jscoverage": "~0.6.0",
"nodeunit": "~0.10.2"
},
"peerDependencies": {
"grunt": ">=0.4.0"
Expand All @@ -54,11 +56,11 @@
"phantomjs"
],
"dependencies": {
"bluebird": "~2.3.0",
"phantomas": "~1.14.0",
"bluebird": "~3.4.7",
"phantomas": "~1.18.0",
"node-fs": "~0.1.7",
"lodash": "~2.4.1",
"html-minifier": "~0.6.0",
"json2csv": "~2.2.1"
"lodash": "~4.17.4",
"html-minifier": "~3.2.3",
"json2csv": "~3.7.3"
}
}
4 changes: 2 additions & 2 deletions tasks/lib/phantomas.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ Phantomas.prototype.formResult = function( results ) {
} );

// process all runs
_.each( results, function( promise ) {
results.forEach( function( promise ) {
if ( promise.isFulfilled() ) {
this.grunt.log.ok( 'Phantomas execution successful.' );

Expand Down Expand Up @@ -805,7 +805,7 @@ Phantomas.prototype.writeData = function( result ) {

// iterate of output formats
// and write data
_.each( this.options.output, function( format ) {
this.options.output.forEach( function( format ) {
if ( this._writeData[ format ] !== undefined ) {
runs.push(
this._writeData[ format ].bind( this )( result )
Expand Down
6 changes: 1 addition & 5 deletions test/lib/phantomasTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ exports.phantomas = {

executePhantomas : function( test ) {
var options = {
url : 'http:https://whatever.com',
url : 'http:https://example.com/',
numberOfRuns : 5,
options : {},
indexPath : './tmp/',
Expand Down Expand Up @@ -879,10 +879,6 @@ exports.phantomas = {
phantomas.readMetricsFile( '123456.json' )
.catch( Error, function( error ) {
test.strictEqual( typeof error, 'object' );
test.strictEqual(
error.toString(),
'SyntaxError: Unexpected token e'
);

test.done();
} );
Expand Down

0 comments on commit d8c7a75

Please sign in to comment.