Skip to content

Commit ab57485

Browse files
hueniversehueniverse
committed
Merge branch 'master' of github.com:hapijs/hapi
2 parents 7410b13 + f0b8612 commit ab57485

File tree

8 files changed

+60
-65
lines changed

8 files changed

+60
-65
lines changed

‎lib/connection.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var Statehood = require('statehood');
1313
var Topo = require('topo');
1414
var Auth = require('./auth');
1515
var Route = require('./route');
16-
var Schema = require('./schema');
1716

1817

1918
// Declare internals

‎lib/defaults.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ var Os = require('os');
55

66
// Declare internals
77

8+
var internals = {};
9+
10+
811
exports.server = {
912
debug: {
1013
request: ['implementation'],

‎lib/methods.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Load modules
22

33
var Boom = require('boom');
4-
var Catbox = require('catbox');
54
var Hoek = require('hoek');
65
var Schema = require('./schema');
76

@@ -40,8 +39,6 @@ exports.methodNameRx = /^[_$a-zA-Z][$\w]*(?:\.[_$a-zA-Z][$\w]*)*$/;
4039

4140
internals.Methods.prototype._add = function (name, method, options, realm) {
4241

43-
var self = this;
44-
4542
Hoek.assert(typeof method === 'function', 'method must be a function');
4643
Hoek.assert(typeof name === 'string', 'name must be a string');
4744
Hoek.assert(name.match(exports.methodNameRx), 'Invalid name:', name);

‎lib/request.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Load modules
22

33
var Events = require('events');
4-
var Stream = require('stream');
54
var Url = require('url');
65
var Accept = require('accept');
76
var Boom = require('boom');

‎lib/response.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Load modules
22

3-
var Crypto = require('crypto');
43
var Stream = require('stream');
54
var Events = require('events');
65
var Boom = require('boom');

‎lib/server.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Load modules
22

33
var Events = require('events');
4-
var Path = require('path');
54
var Catbox = require('catbox');
65
var CatboxMemory = require('catbox-memory');
76
var H2o2 = require('h2o2');
@@ -13,7 +12,6 @@ var Mimos = require('mimos');
1312
var Vision = require('vision');
1413
var Connection = require('./connection');
1514
var Defaults = require('./defaults');
16-
var Handler = require('./handler');
1715
var Methods = require('./methods');
1816
var Plugin = require('./plugin');
1917
var Reply = require('./reply');

‎test/transmit.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,15 +2480,15 @@ describe('transmission', function () {
24802480

24812481
expect(err).to.not.exist();
24822482

2483-
defaults.get('b', function (err, value, cached, report) {
2483+
defaults.get('b', function (err, value1, cached1, report1) {
24842484

24852485
expect(err).to.not.exist();
2486-
expect(value).to.equal(1);
2486+
expect(value1).to.equal(1);
24872487

2488-
primary.get('b', function (err, value, cached, report) {
2488+
primary.get('b', function (err, value2, cached2, report2) {
24892489

24902490
expect(err).to.not.exist();
2491-
expect(cached.item).to.equal(2);
2491+
expect(cached2.item).to.equal(2);
24922492
server.stop();
24932493
done();
24942494
});

‎test/validation.js

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,21 @@ describe('validation', function () {
100100
}
101101
});
102102

103-
server.inject('/?verbose=true', function (res) {
103+
server.inject('/?verbose=true', function (res1) {
104104

105-
expect(res.statusCode).to.equal(400);
105+
expect(res1.statusCode).to.equal(400);
106106

107-
server.inject('/', function (res) {
107+
server.inject('/', function (res2) {
108108

109-
expect(res.statusCode).to.equal(200);
109+
expect(res2.statusCode).to.equal(200);
110110

111-
server.inject('/steve?verbose=true', function (res) {
111+
server.inject('/steve?verbose=true', function (res3) {
112112

113-
expect(res.statusCode).to.equal(200);
113+
expect(res3.statusCode).to.equal(200);
114114

115-
server.inject('/steve?verbose=x', function (res) {
115+
server.inject('/steve?verbose=x', function (res4) {
116116

117-
expect(res.statusCode).to.equal(400);
117+
expect(res4.statusCode).to.equal(400);
118118
done();
119119
});
120120
});
@@ -127,7 +127,7 @@ describe('validation', function () {
127127
var server = new Hapi.Server();
128128
server.connection();
129129

130-
server.auth.scheme('none', function (server, options) {
130+
server.auth.scheme('none', function (authServer, options) {
131131

132132
return {
133133
authenticate: function (request, reply) {
@@ -155,25 +155,25 @@ describe('validation', function () {
155155
}
156156
});
157157

158-
server.inject('/?me=true', function (res) {
158+
server.inject('/?me=true', function (res1) {
159159

160-
expect(res.statusCode).to.equal(400);
160+
expect(res1.statusCode).to.equal(400);
161161

162-
server.inject('/', function (res) {
162+
server.inject('/', function (res2) {
163163

164-
expect(res.statusCode).to.equal(200);
164+
expect(res2.statusCode).to.equal(200);
165165

166-
server.inject('/steve?me=true', function (res) {
166+
server.inject('/steve?me=true', function (res3) {
167167

168-
expect(res.statusCode).to.equal(400);
168+
expect(res3.statusCode).to.equal(400);
169169

170-
server.inject('/john?me=true', function (res) {
170+
server.inject('/john?me=true', function (res4) {
171171

172-
expect(res.statusCode).to.equal(200);
172+
expect(res4.statusCode).to.equal(200);
173173

174-
server.inject('/john?me=x', function (res) {
174+
server.inject('/john?me=x', function (res5) {
175175

176-
expect(res.statusCode).to.equal(400);
176+
expect(res5.statusCode).to.equal(400);
177177
done();
178178
});
179179
});
@@ -282,14 +282,14 @@ describe('validation', function () {
282282
}
283283
});
284284

285-
server.inject('/?a=123', function (res) {
285+
server.inject('/?a=123', function (res1) {
286286

287-
expect(res.statusCode).to.equal(200);
287+
expect(res1.statusCode).to.equal(200);
288288

289-
server.inject('/?a=456', function (res) {
289+
server.inject('/?a=456', function (res2) {
290290

291-
expect(res.statusCode).to.equal(400);
292-
expect(res.result.message).to.equal('Bad query');
291+
expect(res2.statusCode).to.equal(400);
292+
expect(res2.result.message).to.equal('Bad query');
293293
done();
294294
});
295295
});
@@ -839,14 +839,14 @@ describe('validation', function () {
839839
handler: handler
840840
});
841841

842-
server.inject('/', function (res) {
842+
server.inject('/', function (res1) {
843843

844-
expect(res.statusCode).to.equal(200);
845-
expect(res.payload).to.equal('{"some":"value"}');
844+
expect(res1.statusCode).to.equal(200);
845+
expect(res1.payload).to.equal('{"some":"value"}');
846846

847-
server.inject('/', function (res) {
847+
server.inject('/', function (res2) {
848848

849-
expect(res.statusCode).to.equal(500);
849+
expect(res2.statusCode).to.equal(500);
850850
done();
851851
});
852852
});
@@ -876,14 +876,14 @@ describe('validation', function () {
876876
handler: handler
877877
});
878878

879-
server.inject('/?user=admin', function (res) {
879+
server.inject('/?user=admin', function (res1) {
880880

881-
expect(res.statusCode).to.equal(200);
882-
expect(res.payload).to.equal('{"some":"thing","more":"stuff"}');
881+
expect(res1.statusCode).to.equal(200);
882+
expect(res1.payload).to.equal('{"some":"thing","more":"stuff"}');
883883

884-
server.inject('/?user=test', function (res) {
884+
server.inject('/?user=test', function (res2) {
885885

886-
expect(res.statusCode).to.equal(500);
886+
expect(res2.statusCode).to.equal(500);
887887
done();
888888
});
889889
});
@@ -919,12 +919,12 @@ describe('validation', function () {
919919
handler: handler
920920
});
921921

922-
server.inject('/', function (res) {
922+
server.inject('/', function (res1) {
923923

924-
expect(res.statusCode).to.equal(400);
925-
server.inject('/', function (res) {
924+
expect(res1.statusCode).to.equal(400);
925+
server.inject('/', function (res2) {
926926

927-
expect(res.statusCode).to.equal(500);
927+
expect(res2.statusCode).to.equal(500);
928928
done();
929929
});
930930
});
@@ -966,15 +966,15 @@ describe('validation', function () {
966966
handler: handler
967967
});
968968

969-
server.inject('/', function (res) {
969+
server.inject('/', function (res1) {
970970

971-
expect(res.statusCode).to.equal(200);
972-
server.inject('/', function (res) {
971+
expect(res1.statusCode).to.equal(200);
972+
server.inject('/', function (res2) {
973973

974-
expect(res.statusCode).to.equal(400);
975-
server.inject('/', function (res) {
974+
expect(res2.statusCode).to.equal(400);
975+
server.inject('/', function (res3) {
976976

977-
expect(res.statusCode).to.equal(500);
977+
expect(res3.statusCode).to.equal(500);
978978
done();
979979
});
980980
});
@@ -1130,14 +1130,14 @@ describe('validation', function () {
11301130
handler: handler
11311131
});
11321132

1133-
server.inject('/', function (res) {
1133+
server.inject('/', function (res1) {
11341134

1135-
expect(res.statusCode).to.equal(200);
1136-
expect(res.payload).to.equal('{"some":"value"}');
1135+
expect(res1.statusCode).to.equal(200);
1136+
expect(res1.payload).to.equal('{"some":"value"}');
11371137

1138-
server.inject('/', function (res) {
1138+
server.inject('/', function (res2) {
11391139

1140-
expect(res.statusCode).to.equal(500);
1140+
expect(res2.statusCode).to.equal(500);
11411141
done();
11421142
});
11431143
});
@@ -1425,15 +1425,15 @@ describe('validation', function () {
14251425
}
14261426
});
14271427

1428-
var request = {
1428+
var settings = {
14291429
url: '/',
14301430
method: 'GET',
14311431
headers: {
14321432
Accept: 'application/json'
14331433
}
14341434
};
14351435

1436-
server.inject(request, function (res) {
1436+
server.inject(settings, function (res) {
14371437

14381438
expect(res.statusCode).to.equal(200);
14391439
done();
@@ -1461,15 +1461,15 @@ describe('validation', function () {
14611461
}
14621462
});
14631463

1464-
var request = {
1464+
var settings = {
14651465
url: '/',
14661466
method: 'GET',
14671467
headers: {
14681468
Accept: 'application/json'
14691469
}
14701470
};
14711471

1472-
server.inject(request, function (res) {
1472+
server.inject(settings, function (res) {
14731473

14741474
expect(res.statusCode).to.equal(400);
14751475
done();

0 commit comments

Comments
 (0)