From 28d346ab17bd78f10f85573898ed5beff76d01f3 Mon Sep 17 00:00:00 2001 From: Joe Hildebrand Date: Mon, 2 May 2016 11:53:44 -0600 Subject: [PATCH 1/3] Update dependencies; new version of urllib gets rid of native-or-bluebird warning by using any-promise --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1556c74..4073d3a 100644 --- a/package.json +++ b/package.json @@ -22,15 +22,15 @@ }, "license": "MIT", "dependencies": { - "urllib": "~2.5.0", - "utility": "~1.6.0" + "urllib": "~2.9.0", + "utility": "~1.7.1" }, "devDependencies": { - "autod": "1", + "autod": "2", "iconv-lite": "~0.4.13", - "istanbul": "~0.4.1", - "mocha": "~2.3.4", - "should": "~7.1.1" + "istanbul": "~0.4.3", + "mocha": "~2.4.5", + "should": "~8.3.1" }, "engine": { "node": ">=0.11.13" From 08c32893b5183bd6b40fdf350eaea3278bad39ef Mon Sep 17 00:00:00 2001 From: Joe Hildebrand Date: Mon, 2 May 2016 11:55:47 -0600 Subject: [PATCH 2/3] Get travis to test most recent node as well, on their newer infrastructure --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b3cf7bc..dc77123 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: node_js +sudo: false node_js: - "0.11" + - "node" script: "make test-travis" after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls" From bec185bcabece02e4851e25c8e3ef4874b7e680b Mon Sep 17 00:00:00 2001 From: Joe Hildebrand Date: Mon, 2 May 2016 12:02:04 -0600 Subject: [PATCH 3/3] Set timeout to 30s to get tests to pass --- test/index.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/index.test.js b/test/index.test.js index 01c0ad1..8ff3121 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -33,7 +33,8 @@ describe('urllib-sync', function () { it('should request json ok', function () { var res = urllib.request('http://registry.npm.taobao.org/koa', { - dataType: 'json' + dataType: 'json', + timeout: 30000 }); res.data.name.should.equal('koa'); res.status.should.equal(200);