From b971434484e6abfe0d2f68361b01d65678c399f9 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Tue, 5 Mar 2019 09:10:18 +0100
Subject: [PATCH] Make linting green again for all files, not just lib
 :green_book:

---
 .eslintrc          | 10 +++++++++-
 lib/client.js      | 18 +++++++++++-------
 test/api/embed.js  | 20 ++++++++++----------
 test/api/graph.js  |  8 --------
 test/api/metric.js |  1 -
 5 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 test/api/graph.js

diff --git a/.eslintrc b/.eslintrc
index 7c6905e..4ca1bdb 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -26,5 +26,13 @@
     "prefer-rest-params": "warn",
     "fp/no-loops": "warn"
   },
-  "overrides": []
+  "overrides": [
+    {
+      "files": [ "bin/*" ],
+      "rules": {
+        "no-console": "off",
+        "no-continue": "warn"
+      }
+    }
+  ]
 }
diff --git a/lib/client.js b/lib/client.js
index b77aa33..42e4a33 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -88,27 +88,31 @@ DatadogMetricClient.prototype.request = function(method, path, params, callback)
   const req = https.request(http_options, function(res) {
     res.on('error', function(err) {
       if (typeof callback === 'function') {
-        callback(err, null, res.statusCode);
+        return callback(err, null, res.statusCode);
       }
     });
 
-    let data = '';
+    let _data = '';
     res.on('data', function(chunk) {
-      data += chunk;
+      _data += chunk;
     });
 
     res.on('end', function() {
       let error = null;
+      let data;
+
       try {
-        data = json.parse(data);
-      } catch (e) {}
+        data = json.parse(_data);
+      } catch (e) {
+        data = {};
+      }
       if (data.errors) {
         error = data.errors;
         data = null;
       }
 
       if (typeof callback === 'function') {
-        callback(error, data, res.statusCode);
+        return callback(error, data, res.statusCode);
       }
     });
   });
@@ -121,7 +125,7 @@ DatadogMetricClient.prototype.request = function(method, path, params, callback)
   // data being received, or SSL-related issues.
   req.on('error', function(err) {
     if (typeof callback === 'function') {
-      callback(err, null, 0);
+      return callback(err, null, 0);
     }
   });
 
diff --git a/test/api/embed.js b/test/api/embed.js
index a59fc18..081e3c6 100644
--- a/test/api/embed.js
+++ b/test/api/embed.js
@@ -1,6 +1,5 @@
 const assert = require('assert');
 const querystring = require('querystring');
-const extend = require('extend');
 const sinon = require('sinon');
 const Client = require('../../lib/client');
 const Embed = require('../../lib/api/embed');
@@ -9,16 +8,17 @@ describe('api/embed', function() {
   const client = new Client({});
   const embed = Embed(client);
   let stub_request;
-  beforeEach(function() {
-    // Setup `client.request` as a stub
-    stub_request = sinon.stub(client, 'request');
-  });
-  afterEach(function() {
-    // Reset the original `client.request`
-    stub_request.restore();
-    stub_request = null;
-  });
+
   describe('#create', function() {
+    beforeEach(function() {
+      // Setup `client.request` as a stub
+      stub_request = sinon.stub(client, 'request');
+    });
+    afterEach(function() {
+      // Reset the original `client.request`
+      stub_request.restore();
+      stub_request = null;
+    });
     it('should make a valid api call', function() {
       const graphJSON = {
         viz: 'timeseries',
diff --git a/test/api/graph.js b/test/api/graph.js
deleted file mode 100644
index 757ace5..0000000
--- a/test/api/graph.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const assert = require('assert');
-const querystring = require('querystring');
-const extend = require('extend');
-const sinon = require('sinon');
-const client = require('../../lib/client');
-const graph = require('../../lib/api/graph');
-
-describe('api/graph', function() {});
diff --git a/test/api/metric.js b/test/api/metric.js
index c7dc868..632ad5d 100644
--- a/test/api/metric.js
+++ b/test/api/metric.js
@@ -1,5 +1,4 @@
 const assert = require('assert');
-const extend = require('extend');
 const sinon = require('sinon');
 const Client = require('../../lib/client');
 const Metric = require('../../lib/api/metric');