diff --git a/Gruntfile.js b/Gruntfile.js index a0a55a2..bfa9b04 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -94,10 +94,10 @@ module.exports = function(grunt) { }, coverage: { files: [ - {src: ['test/**'], dest: 'coverage/'}, - {src: ['lib/metadata/**'], dest: 'coverage/'}, - {src: ['node_modules/phantomas/**'], dest: 'coverage/'}, - {src: ['lib/tools/phantomas/custom_modules/**'], dest: 'coverage/'} + {cwd: 'test', src: '**/*', dest: 'coverage/test', expand: true}, + {cwd: 'lib/metadata', src: '**/*', dest: 'coverage/lib/metadata', expand: true}, + {cwd: 'node_modules/phantomas', src: '**/*', dest: 'coverage/node_modules/phantomas', expand: true}, + {cwd: 'lib/tools/phantomas/custom_modules', src: '**/*', dest: 'coverage/lib/tools/phantomas/custom_modules', expand: true} ] }, build: { diff --git a/bower.json b/bower.json index 68f64b5..1621660 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,10 @@ { "name": "yellowlabtools", "dependencies": { - "angular": "~1.3.8", - "angular-route": "~1.3.8", - "angular-resource": "~1.3.7", - "angular-sanitize": "~1.4.0-beta.0" + "angular": "~1.3.14", + "angular-route": "~1.3.14", + "angular-resource": "~1.3.14", + "angular-sanitize": "~1.3.14" }, "resolutions": { "angular": "~1.3.8" diff --git a/package.json b/package.json index 22b4096..064294f 100644 --- a/package.json +++ b/package.json @@ -12,45 +12,45 @@ "main": "./lib/index.js", "dependencies": { "async": "~0.9.0", - "body-parser": "~1.10.0", - "compression": "~1.2.2", - "cors": "^2.5.2", - "debug": "~2.1.0", - "express": "~4.10.6", + "body-parser": "~1.12.1", + "compression": "~1.4.3", + "cors": "^2.5.3", + "debug": "~2.1.3", + "express": "~4.12.2", "lwip": "0.0.6", "meow": "^3.0.0", "phantomas": "1.10.0", "ps-node": "0.0.3", "q": "~1.1.2", - "rimraf": "~2.2.8", + "rimraf": "~2.3.2", "temporary": "0.0.8" }, "devDependencies": { - "chai": "^1.10.0", + "chai": "^2.1.2", "grunt": "^0.4.5", "grunt-blanket": "^0.0.8", "grunt-contrib-clean": "^0.6.0", - "grunt-contrib-concat": "^0.5.0", - "grunt-contrib-copy": "^0.7.0", - "grunt-contrib-cssmin": "^0.11.0", - "grunt-contrib-htmlmin": "^0.3.0", - "grunt-contrib-jshint": "^0.10.0", - "grunt-contrib-less": "^0.12.0", - "grunt-contrib-uglify": "^0.7.0", - "grunt-env": "^0.4.2", + "grunt-contrib-concat": "^0.5.1", + "grunt-contrib-copy": "^0.8.0", + "grunt-contrib-cssmin": "^0.12.2", + "grunt-contrib-htmlmin": "^0.4.0", + "grunt-contrib-jshint": "^0.11.0", + "grunt-contrib-less": "^1.0.0", + "grunt-contrib-uglify": "^0.8.0", + "grunt-env": "^0.4.4", "grunt-express": "^1.4.1", "grunt-filerev": "^2.1.2", "grunt-fontsmith": "^0.9.1", "grunt-inline-angular-templates": "^0.1.5", "grunt-line-remover": "^0.0.2", - "grunt-mocha-test": "^0.12.4", + "grunt-mocha-test": "^0.12.7", "grunt-replace": "^0.8.0", "grunt-usemin": "^3.0.0", "matchdep": "^0.3.0", - "mocha": "^2.1.0", - "request": "^2.51.0", - "sinon": "^1.12.1", - "sinon-chai": "^2.6.0" + "mocha": "^2.2.1", + "request": "^2.53.0", + "sinon": "^1.14.0", + "sinon-chai": "^2.7.0" }, "scripts": { "test": "grunt test" diff --git a/test/core/phantomasWrapperTest.js b/test/core/phantomasWrapperTest.js index 62ddd08..3615407 100644 --- a/test/core/phantomasWrapperTest.js +++ b/test/core/phantomasWrapperTest.js @@ -18,14 +18,15 @@ describe('phantomasWrapper', function() { options: {} } }).then(function(data) { + /*jshint -W030 */ data.should.be.an('object'); data.should.have.a.property('generator'); data.generator.should.contain('phantomas'); data.should.have.a.property('url').that.equals(url); - data.should.have.a.property('metrics').that.is.an('object').not.empty(); - data.should.have.a.property('offenders').that.is.an('object').not.empty(); - data.offenders.should.have.a.property('javascriptExecutionTree').that.is.a('array').not.empty(); + data.should.have.a.property('metrics').that.is.an('object').not.empty; + data.should.have.a.property('offenders').that.is.an('object').not.empty; + data.offenders.should.have.a.property('javascriptExecutionTree').that.is.a('array').not.empty; done(); }).fail(function(err) { @@ -68,14 +69,15 @@ describe('phantomasWrapper', function() { } } }).then(function(data) { + /*jshint -W030 */ data.should.be.an('object'); data.should.have.a.property('generator'); data.generator.should.contain('phantomas'); data.should.have.a.property('url').that.equals(url); - data.should.have.a.property('metrics').that.is.an('object').not.empty(); - data.should.have.a.property('offenders').that.is.an('object').not.empty(); - data.offenders.should.have.a.property('javascriptExecutionTree').that.is.a('array').not.empty(); + data.should.have.a.property('metrics').that.is.an('object').not.empty; + data.should.have.a.property('offenders').that.is.an('object').not.empty; + data.offenders.should.have.a.property('javascriptExecutionTree').that.is.a('array').not.empty; done(); }).fail(function(err) {