Skip to content
This repository was archived by the owner on Nov 23, 2022. It is now read-only.

Commit 186c697

Browse files
committed
Merge branch 'develop', prepare 1.0.1
2 parents 0abae8d + f01d7d3 commit 186c697

File tree

4 files changed

+266
-215
lines changed

4 files changed

+266
-215
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
55
[![Build Status](https://travis-ci.org/exoframejs/exoframe-server.svg?branch=master)](https://travis-ci.org/exoframejs/exoframe-server)
66
[![Coverage Status](https://coveralls.io/repos/github/exoframejs/exoframe-server/badge.svg?branch=master)](https://coveralls.io/github/exoframejs/exoframe-server?branch=master)
7+
[![Greenkeeper badge](https://badges.greenkeeper.io/exoframejs/exoframe-server.svg)](https://greenkeeper.io/)
78
[![Docker Pulls](https://img.shields.io/docker/pulls/exoframe/server.svg)](https://hub.docker.com/r/exoframe/server/)
89
[![Docker image size](https://images.microbadger.com/badges/image/exoframe/server.svg)](https://microbadger.com/images/exoframe/server)
910
[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"hapi-auth-jwt": "^4.0.0",
2424
"highland": "^2.11.1",
2525
"js-yaml": "^3.9.1",
26-
"jsonwebtoken": "^7.4.0",
26+
"jsonwebtoken": "^8.1.0",
2727
"lodash": "^4.17.4",
2828
"lokijs": "^1.5.0",
2929
"mkdirp": "^0.5.1",
@@ -36,7 +36,7 @@
3636
"winston": "^2.3.1"
3737
},
3838
"devDependencies": {
39-
"coveralls": "^2.13.1",
39+
"coveralls": "^3.0.0",
4040
"pkg": "^4.1.4",
4141
"tap": "^10.7.1"
4242
}

test/logs.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,11 @@ module.exports = (server, token, data) =>
3030
const parts = line.split(/\dZ\s/);
3131
return parts[1].replace(/\sv\d.+/, ''); // strip any versions
3232
});
33-
t.equal(lines[0], 'npm info it worked if it ends with ok');
34-
t.ok(lines[1].startsWith('npm info using npm@'));
35-
t.ok(lines[2].startsWith('npm info using node@'));
3633
t.deepEqual(
37-
lines.slice(3),
38-
[
39-
'npm info lifecycle node-project@1.0.0~prestart: node-project@1.0.0',
40-
'npm info lifecycle node-project@1.0.0~start: node-project@1.0.0',
41-
'',
42-
'> node-project@1.0.0 start /usr/src/app',
43-
'> node index.js',
44-
'',
45-
'Listening on port 80',
46-
],
34+
lines,
35+
['', '> node-project@1.0.0 start /usr/src/app', '> node index.js', '', 'Listening on port 80'],
4736
'Should have correct log'
4837
);
49-
5038
t.end();
5139
});
5240
});

0 commit comments

Comments
 (0)