Merge pull request hapijs#2533 from hapijs/lint

Eran Hammer · Eran Hammer · commit d52ecd2f62da · 2015-05-17T13:26:50.000-07:00
clean up lint
diff --git a/lib/connection.js b/lib/connection.js
@@ -121,7 +121,7 @@ internals.Connection.prototype._init = function () {
             self.info.uri = (self.settings.uri || (self.info.protocol + '://' + self.info.host + ':' + self.info.port));
         }
 
-        self._onConnection = function _onConnection(connection) {
+        self._onConnection = function _onConnection (connection) {
 
             var key = connection.remoteAddress + ':' + connection.remotePort;
             self._connections[key] = connection;
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "wreck": "5.x.x"
   },
   "scripts": {
-    "test": "node node_modules/lab/bin/lab -a code -t 100 -L",
+    "test": "node node_modules/lab/bin/lab -a code -t 100 -L --lint-errors-threshold 0 --lint-warnings-threshold 0",
     "test-tap": "node node_modules/lab/bin/lab -a code -r tap -o tests.tap"
   },
   "licenses": [
diff --git a/test/connection.js b/test/connection.js
@@ -638,6 +638,7 @@ describe('Connection', function () {
         it('passes the options.artifacts object', function (done) {
 
             var handler = function (request, reply) {
+
                 return reply(request.auth.artifacts);
             };
 
@@ -1252,6 +1253,7 @@ describe('Connection', function () {
 
             var table = server.table()[0].table;
             var paths = table.map(function (route) {
+
                 var obj = {
                     method: route.method,
                     path: route.path
diff --git a/test/handler.js b/test/handler.js
@@ -1110,6 +1110,7 @@ describe('handler', function () {
             };
 
             handler.defaults = function (method) {
+
                 return {
                     app: {
                         x: method
diff --git a/test/reply.js b/test/reply.js
@@ -460,6 +460,7 @@ describe('Reply', function () {
 
                 var response = reply('123').hold();
                 setTimeout(function () {
+
                     response.send();
                 }, 10);
             };
@@ -557,6 +558,7 @@ describe('Reply', function () {
             };
 
             var handler = function (request, reply) {
+
                 return reply(request.pre.m3);
             };
 
diff --git a/test/route.js b/test/route.js
@@ -91,6 +91,7 @@ describe('Route', function () {
         var server = new Hapi.Server();
         server.connection();
         expect(function () {
+
             server.route({ method: 'GET', path: '/', config: {} });
         }).to.throw('Missing or undefined handler: GET /');
         done();
diff --git a/test/transmit.js b/test/transmit.js
@@ -2197,6 +2197,7 @@ describe('transmission', function () {
             server.route({ method: 'GET', path: '/', handler: handler });
 
             server.inject({ url: '/' }, function (res) {
+
                 expect(res.result).to.exist();
                 expect(res.result).to.equal('ok');
                 expect(res.headers['access-control-allow-methods']).to.exist();

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ internals.Connection.prototype._init = function () {`
`121`	`121`	`self.info.uri = (self.settings.uri \|\| (self.info.protocol + '://' + self.info.host + ':' + self.info.port));`
`122`	`122`	`}`
`123`	`123`
`124`		`- self._onConnection = function _onConnection(connection) {`
	`124`	`+ self._onConnection = function _onConnection (connection) {`
`125`	`125`
`126`	`126`	`var key = connection.remoteAddress + ':' + connection.remotePort;`
`127`	`127`	`self._connections[key] = connection;`