Skip to content

Commit 86642f2

Browse files
hueniversehueniverse
committed
node v6
1 parent 78e7de3 commit 86642f2

16 files changed

+89
-90
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ language: node_js
22

33
node_js:
44
- "4"
5-
- "5"
5+
- "6"
66

77
sudo: false

‎npm-shrinkwrap.json

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hapi",
33
"description": "HTTP Server framework",
44
"homepage": "http://hapijs.com",
5-
"version": "13.4.0",
5+
"version": "13.4.1",
66
"repository": {
77
"type": "git",
88
"url": "git://github.com/hapijs/hapi"
@@ -39,9 +39,9 @@
3939
"topo": "2.x.x"
4040
},
4141
"devDependencies": {
42-
"code": "2.x.x",
42+
"code": "3.x.x",
4343
"handlebars": "4.x.x",
44-
"inert": "3.x.x",
44+
"inert": "4.x.x",
4545
"lab": "10.x.x",
4646
"vision": "4.x.x",
4747
"wreck": "7.x.x"

‎test/auth.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ describe('authentication', () => {
244244
server.auth.strategy('default', 'custom', { users: { steve: {} } });
245245

246246
server.auth.default('default');
247-
expect(server.connections[0].auth.settings.default).to.deep.equal({ strategies: ['default'], mode: 'required' });
247+
expect(server.connections[0].auth.settings.default).to.equal({ strategies: ['default'], mode: 'required' });
248248

249249
const handler = function (request, reply) {
250250

@@ -393,7 +393,7 @@ describe('authentication', () => {
393393
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, (res) => {
394394

395395
expect(res.statusCode).to.equal(200);
396-
expect(res.result).to.deep.equal({
396+
expect(res.result).to.equal({
397397
strategies: ['default'],
398398
mode: 'required'
399399
});

‎test/connection.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Connection', () => {
5050

5151
const server = new Hapi.Server();
5252
server.connection({ labels: ['a', 'b', 'a', 'c', 'b'] });
53-
expect(server.connections[0].settings.labels).to.deep.equal(['a', 'b', 'c']);
53+
expect(server.connections[0].settings.labels).to.equal(['a', 'b', 'c']);
5454
done();
5555
});
5656

@@ -586,8 +586,7 @@ describe('Connection', () => {
586586
server.stop({ timeout: 20 }, (err) => {
587587

588588
expect(err).to.not.exist();
589-
expect(timer.elapsed()).to.be.at.least(9);
590-
expect(timer.elapsed()).to.be.at.most(19);
589+
expect(timer.elapsed()).to.be.between(9, 19);
591590
done();
592591
});
593592

@@ -1634,8 +1633,8 @@ describe('Connection', () => {
16341633
server.on('route', (route, connection, srv) => {
16351634

16361635
expect(route.path).to.equal('/');
1637-
expect(connection.settings.labels).to.deep.equal(['a']);
1638-
expect(srv).to.equal(server);
1636+
expect(connection.settings.labels).to.equal(['a']);
1637+
expect(srv).to.shallow.equal(server);
16391638
done();
16401639
});
16411640

@@ -1747,7 +1746,7 @@ describe('Connection', () => {
17471746

17481747
expect(res5.statusCode).to.equal(200);
17491748
expect(res5.payload).to.equal('delete');
1750-
expect(config.method).to.deep.equal(['GET', 'PUT', 'POST', 'DELETE']);
1749+
expect(config.method).to.equal(['GET', 'PUT', 'POST', 'DELETE']);
17511750
done();
17521751
});
17531752
});
@@ -1804,7 +1803,7 @@ describe('Connection', () => {
18041803
});
18051804

18061805
expect(table).to.have.length(6);
1807-
expect(paths).to.only.deep.include([
1806+
expect(paths).to.only.include([
18081807
{ method: 'get', path: '/api/products' },
18091808
{ method: 'get', path: '/api/products/{id}' },
18101809
{ method: 'post', path: '/api/products' },

‎test/handler.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ describe('handler', () => {
138138

139139
const server = new Hapi.Server();
140140
server.register(Inert, Hoek.ignore);
141-
server.connection({ routes: { files: { relativeTo: __dirname } } });
141+
server.connection({ routes: { files: { relativeTo: Path.join(__dirname, '../') } } });
142142
const handler = function (request, reply) {
143143

144-
return reply.file('../package.json').code(499);
144+
return reply.file('./package.json').code(499);
145145
};
146146

147147
server.route({ method: 'GET', path: '/file', handler: handler });
@@ -503,7 +503,7 @@ describe('handler', () => {
503503

504504
server.inject('/user/5', (res) => {
505505

506-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
506+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
507507
done();
508508
});
509509
});
@@ -536,7 +536,7 @@ describe('handler', () => {
536536

537537
server.inject('/user/5', (res) => {
538538

539-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
539+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
540540
done();
541541
});
542542
});
@@ -572,7 +572,7 @@ describe('handler', () => {
572572

573573
server.inject('/user/5', (res) => {
574574

575-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
575+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
576576
done();
577577
});
578578
});
@@ -646,7 +646,7 @@ describe('handler', () => {
646646

647647
server.inject('/user/5', (res) => {
648648

649-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
649+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
650650
done();
651651
});
652652
});
@@ -679,7 +679,7 @@ describe('handler', () => {
679679

680680
server.inject('/user/5', (res) => {
681681

682-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
682+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
683683
done();
684684
});
685685
});
@@ -712,7 +712,7 @@ describe('handler', () => {
712712

713713
server.inject('/user', (res) => {
714714

715-
expect(res.result).to.deep.equal({ name: 'Bob' });
715+
expect(res.result).to.equal({ name: 'Bob' });
716716
done();
717717
});
718718
});
@@ -745,7 +745,7 @@ describe('handler', () => {
745745

746746
server.inject('/user/5', (res) => {
747747

748-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
748+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
749749
done();
750750
});
751751
});
@@ -778,7 +778,7 @@ describe('handler', () => {
778778

779779
server.inject('/user', (res) => {
780780

781-
expect(res.result).to.deep.equal({ name: 'Bob' });
781+
expect(res.result).to.equal({ name: 'Bob' });
782782
done();
783783
});
784784
});
@@ -1038,7 +1038,7 @@ describe('handler', () => {
10381038

10391039
server.inject('/user/5', (res) => {
10401040

1041-
expect(res.result[0].tags).to.deep.equal(['pre', 'method', 'user']);
1041+
expect(res.result[0].tags).to.equal(['pre', 'method', 'user']);
10421042
expect(res.result[0].internal).to.equal(true);
10431043
expect(res.result[0].data.msec).to.exist();
10441044
done();
@@ -1133,7 +1133,7 @@ describe('handler', () => {
11331133
server.route({ method: 'get', path: '/', handler: { test: 'value' } });
11341134
server.inject('/', (res) => {
11351135

1136-
expect(res.result).to.deep.equal({});
1136+
expect(res.result).to.equal({});
11371137
done();
11381138
});
11391139
});
@@ -1160,7 +1160,7 @@ describe('handler', () => {
11601160
server.route({ method: 'get', path: '/', handler: { test: 'value' } });
11611161
server.inject('/', (res) => {
11621162

1163-
expect(res.result).to.deep.equal({ x: 1 });
1163+
expect(res.result).to.equal({ x: 1 });
11641164
done();
11651165
});
11661166
});
@@ -1190,7 +1190,7 @@ describe('handler', () => {
11901190
server.route({ method: 'get', path: '/', handler: { test: 'value' } });
11911191
server.inject('/', (res) => {
11921192

1193-
expect(res.result).to.deep.equal({ x: 'get' });
1193+
expect(res.result).to.equal({ x: 'get' });
11941194
done();
11951195
});
11961196
});

‎test/methods.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ describe('Methods', () => {
200200

201201
server.inject('/user/5', (res) => {
202202

203-
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' });
203+
expect(res.result).to.equal({ id: '5', name: 'Bob' });
204204
done();
205205
});
206206
});

‎test/payload.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,23 +122,21 @@ describe('payload', () => {
122122
}
123123
};
124124

125-
const req = Http.request(options, (res) => {
126-
127-
});
125+
const req = Http.request(options, (res) => { });
128126

129127
req.write('Hello\n');
130128

131129
req.on('error', (err) => {
132130

133131
expect(message).to.equal('Parse Error');
134132
expect(err.code).to.equal('ECONNRESET');
135-
server.stop(done);
133+
server.stop({ timeout: 10 }, done);
136134
});
137135

138136
setTimeout(() => {
139137

140138
req.abort();
141-
}, 15);
139+
}, 50);
142140
});
143141
});
144142

@@ -262,7 +260,7 @@ describe('payload', () => {
262260
server.inject(request, (res) => {
263261

264262
expect(res.result).to.exist();
265-
expect(res.result).to.deep.equal(message);
263+
expect(res.result).to.equal(message);
266264
done();
267265
});
268266
});
@@ -278,7 +276,7 @@ describe('payload', () => {
278276

279277
const receivedContents = Fs.readFileSync(request.payload.path);
280278
Fs.unlinkSync(request.payload.path);
281-
expect(receivedContents).to.deep.equal(sourceContents);
279+
expect(receivedContents).to.equal(sourceContents);
282280
return reply(request.payload.bytes);
283281
};
284282

@@ -379,7 +377,7 @@ describe('payload', () => {
379377
server.inject({ method: 'POST', url: '/', payload: 'testing123', headers: { 'content-type': 'application/unknown' } }, (res) => {
380378

381379
expect(res.statusCode).to.equal(200);
382-
expect(res.result).to.deep.equal(null);
380+
expect(res.result).to.equal(null);
383381
done();
384382
});
385383
});

0 commit comments

Comments
 (0)