Skip to content

Commit c29d2e1

Browse files
hueniversehueniverse
committed
Upgrade wreck to 6.0. closes hapijs#2625 
1 parent cf267f9 commit c29d2e1

File tree

8 files changed

+150
-151
lines changed

8 files changed

+150
-151
lines changed

‎npm-shrinkwrap.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"code": "1.x.x",
4848
"handlebars": "2.x.x",
4949
"lab": "5.x.x",
50-
"wreck": "5.x.x"
50+
"wreck": "6.x.x"
5151
},
5252
"scripts": {
5353
"test": "lab -a code -t 100 -L",

‎test/auth.js

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ describe('authentication', function () {
3737
server.auth.strategy('default', 'custom', true, { users: { steve: {} } });
3838
server.route({ method: 'GET', path: '/', handler: handler });
3939

40-
server.inject('/', function (res) {
40+
server.inject('/', function (res1) {
4141

42-
expect(res.statusCode).to.equal(401);
42+
expect(res1.statusCode).to.equal(401);
4343

44-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
44+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
4545

46-
expect(res.statusCode).to.equal(200);
46+
expect(res2.statusCode).to.equal(200);
4747
done();
4848
});
4949
});
@@ -110,13 +110,13 @@ describe('authentication', function () {
110110
server.auth.scheme('custom', internals.implementation);
111111
server.auth.strategy('default', 'custom', true, { users: { steve: {} }, route: true });
112112

113-
server.inject('/', function (res) {
113+
server.inject('/', function (res1) {
114114

115-
expect(res.statusCode).to.equal(401);
115+
expect(res1.statusCode).to.equal(401);
116116

117-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
117+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
118118

119-
expect(res.statusCode).to.equal(200);
119+
expect(res2.statusCode).to.equal(200);
120120
done();
121121
});
122122
});
@@ -166,14 +166,14 @@ describe('authentication', function () {
166166
}
167167
});
168168

169-
server.inject('/view', function (res) {
169+
server.inject('/view', function (res1) {
170170

171-
expect(res.result).to.equal('<h1>steve</h1>');
171+
expect(res1.result).to.equal('<h1>steve</h1>');
172172

173-
server.inject('/', function (res) {
173+
server.inject('/', function (res2) {
174174

175-
expect(res.statusCode).to.equal(200);
176-
expect(res.result).to.equal('<h1>xyz</h1>');
175+
expect(res2.statusCode).to.equal(200);
176+
expect(res2.result).to.equal('<h1>xyz</h1>');
177177
done();
178178
});
179179
});
@@ -199,13 +199,13 @@ describe('authentication', function () {
199199

200200
server.route({ method: 'GET', path: '/', handler: handler });
201201

202-
server.inject('/', function (res) {
202+
server.inject('/', function (res1) {
203203

204-
expect(res.statusCode).to.equal(401);
204+
expect(res1.statusCode).to.equal(401);
205205

206-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
206+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
207207

208-
expect(res.statusCode).to.equal(200);
208+
expect(res2.statusCode).to.equal(200);
209209
done();
210210
});
211211
});
@@ -225,13 +225,13 @@ describe('authentication', function () {
225225
server.auth.default({ strategy: 'default' });
226226
server.route({ method: 'GET', path: '/', handler: handler });
227227

228-
server.inject('/', function (res) {
228+
server.inject('/', function (res1) {
229229

230-
expect(res.statusCode).to.equal(401);
230+
expect(res1.statusCode).to.equal(401);
231231

232-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
232+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
233233

234-
expect(res.statusCode).to.equal(200);
234+
expect(res2.statusCode).to.equal(200);
235235
done();
236236
});
237237
});
@@ -311,15 +311,15 @@ describe('authentication', function () {
311311
};
312312
server.route({ method: 'GET', path: '/', config: { handler: handler, auth: { mode: 'optional' } } });
313313

314-
server.inject('/', function (res) {
314+
server.inject('/', function (res1) {
315315

316-
expect(res.statusCode).to.equal(200);
317-
expect(res.payload).to.equal('false');
316+
expect(res1.statusCode).to.equal(200);
317+
expect(res1.payload).to.equal('false');
318318

319-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
319+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
320320

321-
expect(res.statusCode).to.equal(200);
322-
expect(res.payload).to.equal('true');
321+
expect(res2.statusCode).to.equal(200);
322+
expect(res2.payload).to.equal('true');
323323
done();
324324
});
325325
});
@@ -477,23 +477,23 @@ describe('authentication', function () {
477477
server.auth.strategy('default', 'custom', 'try', { users: { steve: {} } });
478478
server.route({ method: 'GET', path: '/', handler: handler });
479479

480-
server.inject('/', function (res) {
480+
server.inject('/', function (res1) {
481481

482-
expect(res.statusCode).to.equal(200);
483-
expect(res.result.status).to.equal(false);
484-
expect(res.result.error.message).to.equal('Missing authentication');
482+
expect(res1.statusCode).to.equal(200);
483+
expect(res1.result.status).to.equal(false);
484+
expect(res1.result.error.message).to.equal('Missing authentication');
485485

486-
server.inject({ url: '/', headers: { authorization: 'Custom john' } }, function (res) {
486+
server.inject({ url: '/', headers: { authorization: 'Custom john' } }, function (res2) {
487487

488-
expect(res.statusCode).to.equal(200);
489-
expect(res.result.status).to.equal(false);
490-
expect(res.result.error.message).to.equal('Missing credentials');
488+
expect(res2.statusCode).to.equal(200);
489+
expect(res2.result.status).to.equal(false);
490+
expect(res2.result.error.message).to.equal('Missing credentials');
491491

492-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
492+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res3) {
493493

494-
expect(res.statusCode).to.equal(200);
495-
expect(res.result.status).to.equal(true);
496-
expect(res.result.error).to.not.exist();
494+
expect(res3.statusCode).to.equal(200);
495+
expect(res3.result.status).to.equal(true);
496+
expect(res3.result.error).to.not.exist();
497497
done();
498498
});
499499
});
@@ -1071,7 +1071,7 @@ describe('authentication', function () {
10711071

10721072
var server = new Hapi.Server();
10731073
server.connection();
1074-
server.auth.scheme('test', function (server, options) {
1074+
server.auth.scheme('test', function (srv, options) {
10751075

10761076
return {
10771077
authenticate: function (request, reply) {
@@ -1575,16 +1575,16 @@ describe('authentication', function () {
15751575
server.auth.strategy('default', 'custom', { users: { steve: { name: 'steve' } } });
15761576
server.route({ method: 'GET', path: '/', handler: handler });
15771577

1578-
server.inject('/', function (res) {
1578+
server.inject('/', function (res1) {
15791579

1580-
expect(res.statusCode).to.equal(200);
1581-
expect(res.result.status).to.equal(false);
1580+
expect(res1.statusCode).to.equal(200);
1581+
expect(res1.result.status).to.equal(false);
15821582

1583-
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res) {
1583+
server.inject({ url: '/', headers: { authorization: 'Custom steve' } }, function (res2) {
15841584

1585-
expect(res.statusCode).to.equal(200);
1586-
expect(res.result.status).to.equal(true);
1587-
expect(res.result.user).to.equal('steve');
1585+
expect(res2.statusCode).to.equal(200);
1586+
expect(res2.result.status).to.equal(true);
1587+
expect(res2.result.user).to.equal('steve');
15881588
done();
15891589
});
15901590
});

‎test/connection.js

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -436,15 +436,15 @@ describe('Connection', function () {
436436

437437
socket2.connect(server.info.port, '127.0.0.1', function () {
438438

439-
server.listener.getConnections(function (err, count) {
439+
server.listener.getConnections(function (err, count1) {
440440

441-
expect(count).to.be.greaterThan(0);
441+
expect(count1).to.be.greaterThan(0);
442442

443443
server.stop(function () {
444444

445-
server.listener.getConnections(function (err, count) {
445+
server.listener.getConnections(function (err, count2) {
446446

447-
expect(count).to.equal(0);
447+
expect(count2).to.equal(0);
448448
done();
449449
});
450450
});
@@ -519,16 +519,16 @@ describe('Connection', function () {
519519

520520
socket2.connect(server.info.port, server.connections[0].settings.host, function () {
521521

522-
server.listener.getConnections(function (err, count) {
522+
server.listener.getConnections(function (err, count1) {
523523

524-
expect(count).to.be.greaterThan(0);
524+
expect(count1).to.be.greaterThan(0);
525525
var timer = new Hoek.Bench();
526526

527527
server.stop(function () {
528528

529-
server.listener.getConnections(function (err, count) {
529+
server.listener.getConnections(function (err, count2) {
530530

531-
expect(count).to.equal(0);
531+
expect(count2).to.equal(0);
532532
expect(timer.elapsed()).to.be.at.least(9);
533533
done();
534534
});
@@ -576,7 +576,6 @@ describe('Connection', function () {
576576

577577
err2 = err;
578578
});
579-
580579
});
581580
});
582581

@@ -636,15 +635,15 @@ describe('Connection', function () {
636635
server.route({ method: 'GET', path: '/', handler: handler });
637636
server.start(function (err) {
638637

639-
server.inject('/', function (res) {
638+
server.inject('/', function (res1) {
640639

641-
expect(res.statusCode).to.equal(200);
640+
expect(res1.statusCode).to.equal(200);
642641

643642
setImmediate(function () {
644643

645-
server.inject('/', function (res) {
644+
server.inject('/', function (res2) {
646645

647-
expect(res.statusCode).to.equal(503);
646+
expect(res2.statusCode).to.equal(503);
648647
expect(logged.rss > 10000).to.equal(true);
649648
server.stop();
650649
done();
@@ -1075,12 +1074,12 @@ describe('Connection', function () {
10751074
}
10761075
});
10771076

1078-
server.inject({ method: 'GET', url: '/text' }, function (res) {
1077+
server.inject({ method: 'GET', url: '/text' }, function (res1) {
10791078

1080-
expect(res.result.message).to.equal('boom');
1081-
server.inject({ method: 'GET', url: '/obj' }, function (res) {
1079+
expect(res1.result.message).to.equal('boom');
1080+
server.inject({ method: 'GET', url: '/obj' }, function (res2) {
10821081

1083-
expect(res.result.status).to.equal('ok');
1082+
expect(res2.result.status).to.equal('ok');
10841083
done();
10851084
});
10861085
});
@@ -1268,15 +1267,15 @@ describe('Connection', function () {
12681267
var server = new Hapi.Server();
12691268
server.connection();
12701269
server.route({ method: 'POST', path: '/', handler: handler });
1271-
server.inject({ method: 'HEAD', url: '/' }, function (res) {
1270+
server.inject({ method: 'HEAD', url: '/' }, function (res1) {
12721271

1273-
expect(res.statusCode).to.equal(404);
1274-
expect(res.result).to.not.exist();
1272+
expect(res1.statusCode).to.equal(404);
1273+
expect(res1.result).to.not.exist();
12751274

1276-
server.inject({ method: 'HEAD', url: '/not-there' }, function (res) {
1275+
server.inject({ method: 'HEAD', url: '/not-there' }, function (res2) {
12771276

1278-
expect(res.statusCode).to.equal(404);
1279-
expect(res.result).to.not.exist();
1277+
expect(res2.statusCode).to.equal(404);
1278+
expect(res2.result).to.not.exist();
12801279
done();
12811280
});
12821281
});
@@ -1294,29 +1293,29 @@ describe('Connection', function () {
12941293

12951294
var config = { method: ['GET', 'PUT', 'POST', 'DELETE'], path: '/', handler: handler };
12961295
server.route(config);
1297-
server.inject({ method: 'HEAD', url: '/' }, function (res) {
1296+
server.inject({ method: 'HEAD', url: '/' }, function (res1) {
12981297

1299-
expect(res.statusCode).to.equal(200);
1298+
expect(res1.statusCode).to.equal(200);
13001299

1301-
server.inject({ method: 'GET', url: '/' }, function (res) {
1300+
server.inject({ method: 'GET', url: '/' }, function (res2) {
13021301

1303-
expect(res.statusCode).to.equal(200);
1304-
expect(res.payload).to.equal('get');
1302+
expect(res2.statusCode).to.equal(200);
1303+
expect(res2.payload).to.equal('get');
13051304

1306-
server.inject({ method: 'PUT', url: '/' }, function (res) {
1305+
server.inject({ method: 'PUT', url: '/' }, function (res3) {
13071306

1308-
expect(res.statusCode).to.equal(200);
1309-
expect(res.payload).to.equal('put');
1307+
expect(res3.statusCode).to.equal(200);
1308+
expect(res3.payload).to.equal('put');
13101309

1311-
server.inject({ method: 'POST', url: '/' }, function (res) {
1310+
server.inject({ method: 'POST', url: '/' }, function (res4) {
13121311

1313-
expect(res.statusCode).to.equal(200);
1314-
expect(res.payload).to.equal('post');
1312+
expect(res4.statusCode).to.equal(200);
1313+
expect(res4.payload).to.equal('post');
13151314

1316-
server.inject({ method: 'DELETE', url: '/' }, function (res) {
1315+
server.inject({ method: 'DELETE', url: '/' }, function (res5) {
13171316

1318-
expect(res.statusCode).to.equal(200);
1319-
expect(res.payload).to.equal('delete');
1317+
expect(res5.statusCode).to.equal(200);
1318+
expect(res5.payload).to.equal('delete');
13201319
expect(config.method).to.deep.equal(['GET', 'PUT', 'POST', 'DELETE']);
13211320
done();
13221321
});

0 commit comments

Comments
 (0)