Skip to content

Commit

Permalink
chore(deps): update to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Nov 25, 2017
1 parent d93cc5f commit bf25094
Show file tree
Hide file tree
Showing 7 changed files with 6,691 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .babelrc
@@ -1,4 +1,4 @@
{
"presets": ["es2015"],
"presets": ["env"],
"retainLines": true
}
8 changes: 4 additions & 4 deletions lib/middleware/source_files.js
Expand Up @@ -15,10 +15,10 @@ var findByPath = function (files, path) {

var composeUrl = function (url, basePath, urlRoot, mustEscape) {
return (mustEscape ? querystring.unescape(url) : url)
.replace(urlRoot, '/')
.replace(/\?.*$/, '')
.replace(/^\/absolute/, '')
.replace(/^\/base/, basePath)
.replace(urlRoot, '/')
.replace(/\?.*$/, '')
.replace(/^\/absolute/, '')
.replace(/^\/base/, basePath)
}

// Source Files middleware is responsible for serving all the source files under the test.
Expand Down
32 changes: 16 additions & 16 deletions package.json
Expand Up @@ -350,25 +350,25 @@
"range-parser": "^1.2.0",
"rimraf": "^2.6.0",
"safe-buffer": "^5.0.1",
"socket.io": "2.0.3",
"source-map": "^0.5.3",
"tmp": "0.0.31",
"socket.io": "2.0.4",
"source-map": "^0.6.1",
"tmp": "0.0.33",
"useragent": "^2.1.12"
},
"devDependencies": {
"LiveScript": "^1.3.0",
"babel": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
"babel-core": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-register": "^6.23.0",
"chai": "^3.3.0",
"chai-as-promised": "^6.0.0",
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
"chai-subset": "^1.2.2",
"coffee-script": "^1.12.4",
"cucumber": "^2.2.0",
"eslint": "^3.15.0",
"coffeescript": "^1.12.7",
"cucumber": "^3.1.0",
"eslint": "^4.11.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-promise": "^3.4.2",
"eslint-plugin-react": "^7.0.1",
"eslint-plugin-standard": "^3.0.1",
Expand All @@ -380,12 +380,12 @@
"grunt-contrib-watch": "^1.0.0",
"grunt-conventional-changelog": "^6.0.1",
"grunt-conventional-github-releaser": "^1.0.0",
"grunt-cucumberjs": "^1.0.0",
"grunt-eslint": "^19.0.0",
"grunt-cucumberjs": "^2.0.2",
"grunt-eslint": "^20.1.0",
"grunt-mocha-test": "^0.13.2",
"grunt-npm": "0.0.2",
"http2": "^3.3.6",
"husky": "^0.13.1",
"husky": "^0.14.3",
"jasmine-core": "^2.3.4",
"json3": "^3.3.2",
"karma-browserify": "^5.0.1",
Expand All @@ -411,13 +411,13 @@
"karma-script-launcher": "^1.0.0",
"load-grunt-tasks": "^3.1.0",
"mkdirp": "^0.5.0",
"mocha": "^3.2.0",
"mocha": "^4.0.1",
"mocks": "^0.0.15",
"phantomjs-prebuilt": "^2.1.3",
"proxyquire": "^1.7.11",
"qunitjs": "^2.1.1",
"requirejs": "^2.1.20",
"sinon": "^2.2.0",
"sinon": "^4.1.2",
"sinon-chai": "^2.7.0",
"supertest": "^3.0.0",
"timer-shim": "^0.3.0",
Expand Down
12 changes: 5 additions & 7 deletions test/unit/config.spec.js
Expand Up @@ -123,10 +123,8 @@ describe('config', () => {

expect(logSpy).to.have.been.called
var event = logSpy.lastCall.args
expect(event).to.be.deep.equal([
'Error in config file!\n',
new SyntaxError('Unexpected token =')
])
expect(event[0]).to.eql('Error in config file!\n')
expect(event[1].message).to.eql('Unexpected token =')
expect(mocks.process.exit).to.have.been.calledWith(1)
})

Expand Down Expand Up @@ -445,7 +443,7 @@ describe('config', () => {
var injector = new di.Injector([baseModule].concat(config.plugins))
var injectedArgs = injector.get('launcher:custom')

expect(injectedArgs).to.be.defined
expect(injectedArgs).to.exist
expect(injectedArgs.first).to.equal(123)
expect(injectedArgs.whatever).to.equal('aaa')
})
Expand All @@ -464,7 +462,7 @@ describe('config', () => {
var injector = new di.Injector([baseModule].concat(config.plugins))
var injectedArgs = injector.get('preprocessor:custom')

expect(injectedArgs).to.be.defined
expect(injectedArgs).to.exist
expect(injectedArgs.second).to.equal(123)
expect(injectedArgs.whatever).to.equal('bbb')
})
Expand All @@ -483,7 +481,7 @@ describe('config', () => {
var injector = new di.Injector([baseModule].concat(config.plugins))
var injectedArgs = injector.get('reporter:custom')

expect(injectedArgs).to.be.defined
expect(injectedArgs).to.exist
expect(injectedArgs.third).to.equal(123)
expect(injectedArgs.whatever).to.equal('ccc')
})
Expand Down
2 changes: 1 addition & 1 deletion test/unit/events.spec.js
Expand Up @@ -147,7 +147,7 @@ describe('events', () => {
emitter.on('bar', spy)

replyEvents()
expect(spy).to.not.have.been.caleed
expect(spy).to.not.have.been.called
})

it('should work with overriden "emit" method', () => {
Expand Down
17 changes: 8 additions & 9 deletions test/unit/file-list.spec.js
Expand Up @@ -104,7 +104,7 @@ describe('FileList', () => {

it('returns only served files', () => {
var files = [
new config.Pattern('/a.*', true), // served: true
new config.Pattern('/a.*', true), // served: true
new config.Pattern('/some/*.js', false) // served: false
]

Expand All @@ -117,7 +117,7 @@ describe('FileList', () => {

it('marks no cache files', () => {
var files = [
new config.Pattern('/a.*'), // nocach: false
new config.Pattern('/a.*'), // nocach: false
new config.Pattern('/some/*.js', true, true, true, true) // nocache: true
]

Expand Down Expand Up @@ -363,8 +363,7 @@ describe('FileList', () => {
var file = findFile('http://some.com', bucket)

expect(file).to.have.property('isUrl', true)
}
)
})
})

it('preprocesses all files', () => {
Expand Down Expand Up @@ -416,8 +415,7 @@ describe('FileList', () => {
])
.then(() => {
expect(list._refresh).to.have.been.calledTwice
}
)
})
})
})

Expand Down Expand Up @@ -873,9 +871,10 @@ describe('FileList', () => {
mockFs._touchFile('/some/b.js', '2020-01-01')
list.changeFile('/some/b.js')
list.removeFile('/some/a.js') // /some/b.js, /a.txt
list.removeFile('/a.txt') // /some/b.js
list.addFile('/a.txt') // /some/b.js, /a.txt
list.addFile('/some/0.js').then(() => { // /some/0.js, /some/b.js, /a.txt
list.removeFile('/a.txt') // /some/b.js
list.addFile('/a.txt') // /some/b.js, /a.txt
list.addFile('/some/0.js').then(() => {
// /some/0.js, /some/b.js, /a.txt
clock.tick(99)
expect(modified).to.not.have.been.called
mockFs._touchFile('/a.txt', '2020-01-01')
Expand Down

0 comments on commit bf25094

Please sign in to comment.