Additional => conversions. For #2877

hapijs · Oct 25, 2015 · ca3ee7e · ca3ee7e
1 parent a7b3ad7
commit ca3ee7e
Show file tree

Hide file tree

Showing 17 changed files with 1,498 additions and 1,325 deletions.
diff --git a/test/auth.js b/test/auth.js
diff --git a/test/connection.js b/test/connection.js
diff --git a/test/cors.js b/test/cors.js
diff --git a/test/handler.js b/test/handler.js
diff --git a/test/methods.js b/test/methods.js
diff --git a/test/payload.js b/test/payload.js
diff --git a/test/plugin.js b/test/plugin.js
diff --git a/test/protect.js b/test/protect.js
@@ -32,23 +32,23 @@ describe('Protect', () => {
 
         const handler = function (request, reply) {
 
-            process.nextTick(function () {
+            process.nextTick(() => {
 
                 throw new Error('no domain');
             });
         };
 
         server.route({ method: 'GET', path: '/', handler: handler });
         const domain = Domain.createDomain();
-        domain.once('error', function (err) {
+        domain.once('error', (err) => {
 
             expect(err.message).to.equal('no domain');
             done();
         });
 
-        domain.run(function () {
+        domain.run(() => {
 
-            server.inject('/', function (res) { });
+            server.inject('/', (res) => { });
         });
     });
 
@@ -60,14 +60,14 @@ describe('Protect', () => {
         const handler = function (request, reply) {
 
             reply('ok');
-            process.nextTick(function () {
+            process.nextTick(() => {
 
                 throw new Error('should not leave domain');
             });
         };
 
         server.route({ method: 'GET', path: '/', handler: handler });
-        server.inject('/', function (res) {
+        server.inject('/', (res) => {
 
             expect(res.statusCode).to.equal(200);
             done();
@@ -83,19 +83,19 @@ describe('Protect', () => {
 
             reply('ok');
 
-            process.nextTick(function () {
+            process.nextTick(() => {
 
                 throw new Error('should not leave domain 1');
             });
 
-            process.nextTick(function () {
+            process.nextTick(() => {
 
                 throw new Error('should not leave domain 2');
             });
         };
 
         server.route({ method: 'GET', path: '/', handler: handler });
-        server.inject('/', function (res) {
+        server.inject('/', (res) => {
 
             expect(res.statusCode).to.equal(200);
             done();
@@ -113,19 +113,21 @@ describe('Protect', () => {
 
         const test = function (srv, options, next) {
 
-            srv.ext('onPreStart', function (plugin, afterNext) {
+            const preStart = function (plugin, afterNext) {
 
                 const client = new Client();                      // Created in the global domain
                 plugin.bind({ client: client });
                 afterNext();
-            });
+            };
+
+            srv.ext('onPreStart', preStart);
 
             srv.route({
                 method: 'GET',
                 path: '/',
                 handler: function (request, reply) {
 
-                    this.client.on('event', request.domain.bind(function () {
+                    this.client.on('event', request.domain.bind(() => {
 
                         throw new Error('boom');                // Caught by the global domain by default, not request domain
                     }));
@@ -143,14 +145,14 @@ describe('Protect', () => {
 
         const server = new Hapi.Server({ debug: false });
         server.connection();
-        server.register(test, function (err) {
+        server.register(test, (err) => {
 
             expect(err).to.not.exist();
 
-            server.initialize(function (err) {
+            server.initialize((err) => {
 
                 expect(err).to.not.exist();
-                server.inject('/', function (res) {
+                server.inject('/', (res) => {
 
                     done();
                 });
@@ -163,7 +165,7 @@ describe('Protect', () => {
         const handler = function (request, reply) {
 
             reply('ok');
-            setTimeout(function () {
+            setTimeout(() => {
 
                 throw new Error('After done');
             }, 10);
@@ -172,14 +174,14 @@ describe('Protect', () => {
         const server = new Hapi.Server({ debug: false });
         server.connection();
 
-        server.on('log', function (event, tags) {
+        server.on('log', (event, tags) => {
 
             expect(tags.implementation).to.exist();
             done();
         });
 
         server.route({ method: 'GET', path: '/', handler: handler });
-        server.inject('/', function (res) {
+        server.inject('/', (res) => {
 
             expect(res.statusCode).to.equal(200);
         });

diff --git a/test/reply.js b/test/reply.js
@@ -37,7 +37,7 @@ describe('Reply', () => {
         const server = new Hapi.Server({ debug: false });
         server.connection();
         server.route({ method: 'GET', path: '/', handler: handler });
-        server.inject('/', function (res) {
+        server.inject('/', (res) => {
 
             expect(res.statusCode).to.equal(500);
             done();
@@ -54,7 +54,7 @@ describe('Reply', () => {
         const server = new Hapi.Server();
         server.connection();
         server.route({ method: 'GET', path: '/', handler: handler });
-        server.inject('/', function (res) {
+        server.inject('/', (res) => {
 
             expect(res.statusCode).to.equal(302);
             expect(res.headers.location).to.equal('/elsewhere');
@@ -74,7 +74,7 @@ describe('Reply', () => {
             const server = new Hapi.Server();
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(200);
                 expect(res.result).to.equal('steve');
@@ -92,7 +92,7 @@ describe('Reply', () => {
             const server = new Hapi.Server();
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(400);
                 done();
@@ -109,7 +109,7 @@ describe('Reply', () => {
             const server = new Hapi.Server();
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(400);
                 done();
@@ -129,7 +129,7 @@ describe('Reply', () => {
             const server = new Hapi.Server();
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(200);
                 expect(res.result).to.equal(null);
@@ -150,7 +150,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', config: { handler: handler } });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(299);
                 expect(res.result).to.equal('Tada1');
@@ -170,7 +170,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.payload).to.equal('{\"a\":1,\"b\":2}');
                 expect(res.headers['content-length']).to.equal(13);
@@ -189,7 +189,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.payload).to.equal('false');
                 done();
@@ -207,7 +207,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(500);
                 expect(res.result).to.exist();
@@ -226,7 +226,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(299);
                 expect(res.headers['content-length']).to.equal(0);
@@ -265,13 +265,13 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/stream', config: { handler: handler, cache: { expiresIn: 9999 } } });
 
-            server.inject('/stream', function (res1) {
+            server.inject('/stream', (res1) => {
 
                 expect(res1.result).to.equal('xy');
                 expect(res1.statusCode).to.equal(200);
                 expect(res1.headers['cache-control']).to.equal('max-age=2, must-revalidate');
 
-                server.inject({ method: 'HEAD', url: '/stream' }, function (res2) {
+                server.inject({ method: 'HEAD', url: '/stream' }, (res2) => {
 
                     expect(res2.result).to.equal('');
                     expect(res2.statusCode).to.equal(200);
@@ -305,23 +305,23 @@ describe('Reply', () => {
             server.route({ method: 'GET', path: '/writable', handler: writableHandler });
 
             let requestError;
-            server.on('request-error', function (request, err) {
+            server.on('request-error', (request, err) => {
 
                 requestError = err;
             });
 
-            server.initialize(function (err) {
+            server.initialize((err) => {
 
                 expect(err).to.not.exist();
 
-                server.inject('/stream', function (res1) {
+                server.inject('/stream', (res1) => {
 
                     expect(res1.statusCode).to.equal(500);
                     expect(requestError).to.exist();
                     expect(requestError.message).to.equal('Stream must have a streams2 readable interface');
 
                     requestError = undefined;
-                    server.inject('/writable', function (res2) {
+                    server.inject('/writable', (res2) => {
 
                         expect(res2.statusCode).to.equal(500);
                         expect(requestError).to.exist();
@@ -349,11 +349,11 @@ describe('Reply', () => {
             server.route({ method: 'GET', path: '/', handler: handler });
             server.route({ method: 'GET', path: '/stream', handler: streamHandler });
 
-            server.initialize(function (err) {
+            server.initialize((err) => {
 
                 expect(err).to.not.exist();
 
-                server.inject('/stream', function (res) {
+                server.inject('/stream', (res) => {
 
                     expect(res.statusCode).to.equal(500);
                     done();
@@ -391,7 +391,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', handler: handler });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(500);
                 done();
@@ -432,7 +432,7 @@ describe('Reply', () => {
                 server.connection();
                 server.route({ method: 'GET', path: '/stream', config: { handler: handler, cache: { expiresIn: 9999 } } });
 
-                server.inject('/stream', function (res) {
+                server.inject('/stream', (res) => {
 
                     expect(res.result).to.equal('xy');
                     expect(res.statusCode).to.equal(299);
@@ -451,7 +451,7 @@ describe('Reply', () => {
                 server.connection();
                 server.route({ method: 'GET', path: '/', handler: handler });
 
-                server.inject('/', function (res) {
+                server.inject('/', (res) => {
 
                     expect(res.statusCode).to.equal(299);
                     expect(res.result.toString()).to.equal('buffer content');
@@ -476,7 +476,7 @@ describe('Reply', () => {
 
             server.route({ method: 'GET', path: '/domain', handler: handler });
 
-            server.inject('/domain', function (res) {
+            server.inject('/domain', (res) => {
 
                 expect(res.result).to.equal('123');
                 done();
@@ -491,15 +491,15 @@ describe('Reply', () => {
             const handler = function (request, reply) {
 
                 const response = reply('123').hold();
-                setTimeout(function () {
+                setTimeout(() => {
 
                     response.send();
                 }, 10);
             };
 
             server.route({ method: 'GET', path: '/domain', handler: handler });
 
-            server.inject('/domain', function (res) {
+            server.inject('/domain', (res) => {
 
                 expect(res.result).to.equal('123');
                 done();
@@ -521,7 +521,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', config: { handler: handler } });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.result).to.equal('');
                 done();
@@ -539,7 +539,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', config: { handler: handler } });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.result).to.equal('');
                 done();
@@ -560,7 +560,7 @@ describe('Reply', () => {
             server.connection();
             server.route({ method: 'GET', path: '/', config: { handler: handler } });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(200);
                 expect(res.result).to.equal(null);
@@ -609,7 +609,7 @@ describe('Reply', () => {
                 }
             });
 
-            server.inject('/', function (res) {
+            server.inject('/', (res) => {
 
                 expect(res.statusCode).to.equal(200);
                 expect(res.result).to.deep.equal({