From a8c00ea624b6b9950a217c23eaf4e5a8946f4577 Mon Sep 17 00:00:00 2001 From: "J. Harshbarger" Date: Sat, 8 Oct 2016 11:22:01 +0900 Subject: [PATCH 1/3] Update dev deps --- .eslintrc | 8 ++++++-- index.spec.js | 22 +++++++++++----------- package.json | 10 +++++----- util/credit.spec.js | 10 +++++----- util/package.spec.js | 20 ++++++++++---------- 5 files changed, 37 insertions(+), 33 deletions(-) mode change 100644 => 100755 package.json diff --git a/.eslintrc b/.eslintrc index 6399eb6..c6cb8af 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,6 +1,10 @@ { - "ecmaFeatures": { - "modules": true + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "ecmaFeatures": { + "modules": true + } }, "rules": { "indent": [ diff --git a/index.spec.js b/index.spec.js index 43129d7..60320ae 100644 --- a/index.spec.js +++ b/index.spec.js @@ -77,20 +77,20 @@ test.cb( 'credits - folder exists', t => { credits( path ) .then( credits => { - t.same( credits[ 0 ].name, 'Alice Bobson' ); - t.same( credits[ 0 ].packages, [ 'bar', 'boom', 'baz' ] ); + t.deepEqual( credits[ 0 ].name, 'Alice Bobson' ); + t.deepEqual( credits[ 0 ].packages, [ 'bar', 'boom', 'baz' ] ); - t.same( credits[ 1 ].name, 'Bob Calsow' ); - t.same( credits[ 1 ].packages, [ 'boing', 'foo' ] ); + t.deepEqual( credits[ 1 ].name, 'Bob Calsow' ); + t.deepEqual( credits[ 1 ].packages, [ 'boing', 'foo' ] ); - t.same( credits[ 2 ].name, 'Bob Loblaw' ); - t.same( credits[ 2 ].packages, [ 'cycle', 'linked' ] ); + t.deepEqual( credits[ 2 ].name, 'Bob Loblaw' ); + t.deepEqual( credits[ 2 ].packages, [ 'cycle', 'linked' ] ); - t.same( credits[ 3 ].name, 'Randy Ran' ); - t.same( credits[ 3 ].packages, [ 'baz' ] ); + t.deepEqual( credits[ 3 ].name, 'Randy Ran' ); + t.deepEqual( credits[ 3 ].packages, [ 'baz' ] ); - t.same( credits[ 4 ].name, 'Bobby Bob' ); - t.same( credits[ 4 ].packages, [ 'baz' ] ); + t.deepEqual( credits[ 4 ].name, 'Bobby Bob' ); + t.deepEqual( credits[ 4 ].packages, [ 'baz' ] ); cleanUpCb(); @@ -103,7 +103,7 @@ test.cb( 'credits - folder exists', t => { test.cb( 'credits - folder does not exist', t => { credits( '/path/that/does/not/exist' ) .catch( error => { - t.same( error.message, '/path/that/does/not/exist does not exist' ); + t.deepEqual( error.message, '/path/that/does/not/exist does not exist' ); t.end(); } ); } ); diff --git a/package.json b/package.json old mode 100644 new mode 100755 index fdb4003..dbcf58b --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "lint": "eslint *.js util/*", - "test": "npm run lint && nyc ava *.spec.js ./**/*.spec.js", + "test": "npm run lint && nyc ava *.spec.js ./util/*.spec.js", "coveralls": "nyc report --reporter=text-lcov | coveralls" }, "repository": { @@ -19,11 +19,11 @@ }, "homepage": "https://github.com/stefanjudis/credits#readme", "devDependencies": { - "ava": "^0.11.0", + "ava": "^0.16.0", "coveralls": "^2.11.4", - "eslint": "^1.7.3", - "nyc": "^5.0.1", - "tmp": "0.0.28" + "eslint": "^3.7.1", + "nyc": "^8.3.1", + "tmp": "0.0.29" }, "dependencies": { "all-stars": "^1.1.0", diff --git a/util/credit.spec.js b/util/credit.spec.js index f970038..7ea84d2 100644 --- a/util/credit.spec.js +++ b/util/credit.spec.js @@ -7,7 +7,7 @@ test.cb( 'getCredit - email is included', t => { let credit = creditUtil.getCredit( credits, { email : 'bob@calsow.io' } ); - t.same( credit, { email : 'bob@calsow.io', url : 'http://4waisenkinder.de' } ); + t.deepEqual( credit, { email : 'bob@calsow.io', url : 'http://4waisenkinder.de' } ); t.end(); } ); @@ -16,7 +16,7 @@ test.cb( 'getCredit - only name is included', t => { let credit = creditUtil.getCredit( credits, { name : 'Bob Calsow' } ); - t.same( credit, { name : 'Bob Calsow', url : 'http://4waisenkinder.de' } ); + t.deepEqual( credit, { name : 'Bob Calsow', url : 'http://4waisenkinder.de' } ); t.end(); } ); @@ -25,7 +25,7 @@ test.cb( 'getCredit - particular credit is not included', t => { let credit = creditUtil.getCredit( credits, { name : 'Stefan Judis' } ); - t.same( credit, false ); + t.deepEqual( credit, false ); t.end(); } ); @@ -35,7 +35,7 @@ test.cb( 'addCreditToCredits - credit is not included yet', t => { credits = creditUtil.addCreditToCredits( credits, { name : 'Bob Calsow' }, 'foo' ); - t.same( credits, [ { name : 'Bob Calsow', packages : [ 'foo' ] } ] ); + t.deepEqual( credits, [ { name : 'Bob Calsow', packages : [ 'foo' ] } ] ); t.end(); } ); @@ -44,6 +44,6 @@ test.cb( 'addCreditToCredits - credit is included', t => { credits = creditUtil.addCreditToCredits( credits, { name : 'Bob Calsow' }, 'bar' ); - t.same( credits, [ { name : 'Bob Calsow', packages : [ 'foo', 'bar' ] } ] ); + t.deepEqual( credits, [ { name : 'Bob Calsow', packages : [ 'foo', 'bar' ] } ] ); t.end(); } ); diff --git a/util/package.spec.js b/util/package.spec.js index e41afb6..72646e9 100644 --- a/util/package.spec.js +++ b/util/package.spec.js @@ -10,7 +10,7 @@ test.cb( 'getAuthor - author is a string', t => { let author1 = packageUtil.getAuthor( packageJson1 ); - t.same( + t.deepEqual( author1, { name : 'Bob Calsow', email : undefined, url : undefined } ); @@ -22,7 +22,7 @@ test.cb( 'getAuthor - author is a string', t => { let author2 = packageUtil.getAuthor( packageJson2 ); - t.same( + t.deepEqual( author2, { name : 'Bob Calsow', email : 'bob@calsow.io', url : undefined } ); @@ -34,7 +34,7 @@ test.cb( 'getAuthor - author is a string', t => { let author3 = packageUtil.getAuthor( packageJson3 ); - t.same( + t.deepEqual( author3, { name : 'Bob Calsow', email : 'bob@calsow.io', url : 'http://4waisenkinder.de' } ); @@ -46,7 +46,7 @@ test.cb( 'getAuthor - author is a string', t => { let author4 = packageUtil.getAuthor( packageJson4 ); - t.same( + t.deepEqual( author4, { name : 'Bob Calsow', email : undefined, url : 'http://4waisenkinder.de' } ); @@ -65,7 +65,7 @@ test.cb( 'getAuthor - author is an object', t => { let author = packageUtil.getAuthor( packageJson ); - t.same( author, packageJson.author ); + t.deepEqual( author, packageJson.author ); t.end(); } ); @@ -74,7 +74,7 @@ test.cb( 'getAuthor - author is not defined', t => { let author = packageUtil.getAuthor( packageJson ); - t.same( author, false ); + t.deepEqual( author, false ); t.end(); } ); @@ -127,11 +127,11 @@ test.cb( 'getMaintainers - maintainers is not defined', t => { let maintainers = packageUtil.getMaintainers( packageJson ); - t.same( + t.deepEqual( maintainers[ 0 ], { name : 'Bob Calsow', email : 'bob@calsow.io', url : 'http://4waisenkinder.de' } ); - t.same( + t.deepEqual( maintainers[ 1 ], { name : 'Foo bar', email : 'foo@bar.io', url : 'http://foo.bar' } ); @@ -145,7 +145,7 @@ test.cb( 'getMaintainers - maintainers is an invalid string', t => { let maintainers = packageUtil.getMaintainers( packageJson ); - t.same( + t.deepEqual( maintainers[ 0 ], { name : 'Bob Calsow', email : 'bob@calsow.io', url : 'http://4waisenkinder.de' } ); @@ -157,6 +157,6 @@ test.cb( 'getMaintainers - maintainers is not defined', t => { let maintainers = packageUtil.getMaintainers( packageJson ); - t.same( maintainers, false ); + t.deepEqual( maintainers, false ); t.end(); } ); From 74afcd5daaab55e915ca370d6b425b0725ddff1f Mon Sep 17 00:00:00 2001 From: "J. Harshbarger" Date: Sat, 8 Oct 2016 11:25:12 +0900 Subject: [PATCH 2/3] Bump es6-promise --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbcf58b..1a6418b 100755 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "all-stars": "^1.1.0", - "es6-promise": "^3.0.2", + "es6-promise": "^4.0.5", "object-assign": "^4.0.1" } } From 41132aab2366b6edad0dc277b093de5400a9c7d0 Mon Sep 17 00:00:00 2001 From: "J. Harshbarger" Date: Sat, 8 Oct 2016 11:45:25 +0900 Subject: [PATCH 3/3] Only run CI tests on node v4 and 6 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57f9dbd..27feda5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: node_js node_js: - - "0.10" - - "0.12" - "4" + - "6" branches: only: