From b9a4ce989436b7213178becb37c635476c8c11a1 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sun, 17 May 2015 21:02:28 +0200 Subject: [PATCH] fix(deps): Update dependencies * chokidar * glob * minimatch * q * mime * useragent * graceful-fs * connect * source-map * colors Fixes parts of #1410 --- package.json | 32 ++++++++++++++++---------------- test/e2e/support/world.coffee | 4 ++-- test/unit/helper.spec.coffee | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index a0ef1ae8a..a270501d7 100644 --- a/package.json +++ b/package.json @@ -162,23 +162,23 @@ "Jeff Froom " ], "dependencies": { - "di": "~0.0.1", + "chokidar": "^1.0.1", + "colors": "^1.1.0", + "connect": "^2.29.2", + "di": "^0.0.1", + "glob": "^5.0.6", + "graceful-fs": "^3.0.6", + "http-proxy": "^0.10", + "lodash": "^3.8.0", + "log4js": "^0.6.25", + "mime": "^1.3.4", + "minimatch": "^2.0.7", + "optimist": "^0.6.1", + "q": "^1.4.1", + "rimraf": "^2.3.3", "socket.io": "0.9.16", - "chokidar": ">=0.8.2", - "glob": "~3.2.7", - "minimatch": "~0.2", - "http-proxy": "~0.10", - "optimist": "~0.6.0", - "rimraf": "~2.2.5", - "q": "~0.9.7", - "colors": "~0.6.2", - "lodash": "~2.4.1", - "mime": "~1.2.11", - "log4js": "~0.6.3", - "useragent": "~2.0.4", - "graceful-fs": "~2.0.1", - "connect": "~2.26.0", - "source-map": "~0.1.31" + "source-map": "^0.4.2", + "useragent": "^2.1.6" }, "devDependencies": { "LiveScript": "^1.3.0", diff --git a/test/e2e/support/world.coffee b/test/e2e/support/world.coffee index 31f536b8c..f317dd47d 100644 --- a/test/e2e/support/world.coffee +++ b/test/e2e/support/world.coffee @@ -9,7 +9,7 @@ _ = require 'lodash' World = (callback) -> - @template = """ + @template = _.template """ module.exports = function (config) { config.set( <%= content %> @@ -41,7 +41,7 @@ World = (callback) -> done err, hash @generateJS = (config) -> - _.template @template, {content: JSON.stringify config} + @template {content: JSON.stringify config} @lastRun = error: null diff --git a/test/unit/helper.spec.coffee b/test/unit/helper.spec.coffee index 83fd0e2ec..d947f81d6 100644 --- a/test/unit/helper.spec.coffee +++ b/test/unit/helper.spec.coffee @@ -16,19 +16,19 @@ describe 'helper', -> it 'should parse iOS', -> expecting('Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 ' + '(KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25'). - to.be.equal 'Mobile Safari 6.0.0 (iOS 6.0)' + to.be.equal 'Mobile Safari 6.0.0 (iOS 6.0.0)' it 'should parse Linux', -> expecting('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081216 ' + 'Ubuntu/8.04 (hardy) Firefox/2.0.0.19'). - to.be.equal 'Firefox 2.0.0 (Ubuntu 8.04)' + to.be.equal 'Firefox 2.0.0 (Ubuntu 8.04.0)' it 'should degrade gracefully when OS not recognized', -> expecting('Mozilla/5.0 (X11; U; FreeBSD; i386; en-US; rv:1.7) Gecko/20081216 ' + 'Firefox/2.0.0.19'). - to.be.equal 'Firefox 2.0.0 (FreeBSD)' + to.be.equal 'Firefox 2.0.0 (FreeBSD 0.0.0)' it 'should parse Chrome', -> @@ -44,7 +44,7 @@ describe 'helper', -> it 'should parse Firefox', -> expecting('Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 ' + 'Firefox/7.0.1'). - to.be.equal 'Firefox 7.0.1 (Mac OS X 10.6)' + to.be.equal 'Firefox 7.0.1 (Mac OS X 10.6.0)' it 'should parse Opera', -> @@ -62,40 +62,40 @@ describe 'helper', -> it 'should parse IE7', -> expecting('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; WOW64; SLCC1; ' + '.NET CLR 2.0.50727; .NET4.0C; .NET4.0E)'). - to.be.equal 'IE 7.0.0 (Windows Vista)' + to.be.equal 'IE 7.0.0 (Windows Vista 0.0.0)' it 'should parse IE8', -> expecting('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; ' + 'SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET4.0C; ' + '.NET4.0E; InfoPath.3)"'). - to.be.equal 'IE 8.0.0 (Windows 7)' + to.be.equal 'IE 8.0.0 (Windows 7 0.0.0)' it 'should parse IE9', -> expecting('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; ' + '.NET CLR 2.0.50727; SLCC2; .NET CLR 3.5.30729; .NET CLR 3.0.30729; '+ 'Media Center PC 6.0)'). - to.be.equal 'IE 9.0.0 (Windows 7)' + to.be.equal 'IE 9.0.0 (Windows 7 0.0.0)' it 'should parse IE10', -> expecting('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0; ' + '.NET4.0E; .NET4.0C)'). - to.be.equal 'IE 10.0.0 (Windows 8)' + to.be.equal 'IE 10.0.0 (Windows 8 0.0.0)' it 'should parse PhantomJS', -> expecting('Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) ' + 'PhantomJS/1.6.0 Safari/534.34'). - to.be.equal 'PhantomJS 1.6.0 (Mac OS X)' + to.be.equal 'PhantomJS 1.6.0 (Mac OS X 0.0.0)' # Fix for #318 it 'should parse old Android Browser', -> expecting('Mozilla/5.0 (Linux; U; Android 4.2; en-us; sdk Build/JB_MR1) ' + 'AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'). - to.be.equal 'Android 4.2.0 (Android 4.2)' + to.be.equal 'Android 4.2.0 (Android 4.2.0)' #============================================================================== # helper.isDefined()