Sort out linting of tests

luispabon · Sep 5, 2017 · 3f8b9ed · 3f8b9ed
1 parent 0a3a260
commit 3f8b9ed
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -2,6 +2,9 @@
   "extends" : [
     "standard"
   ],
+  "plugins": [
+    "mocha"
+  ],
   "globals" : {
     "expect" : false,
     "should" : false,
@@ -10,6 +13,7 @@
   "rules": {
     "semi" : [2, "never"],
     "max-len": [2, 120, 2],
-    "generator-star-spacing": 0
+    "generator-star-spacing": 0,
+    "mocha/no-exclusive-tests": "error"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superagent-retry-delay",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A retrying layer for a superagent request with delay support",
   "license": "MIT",
   "keywords": [
@@ -13,6 +13,7 @@
     "type": "git",
     "url": "git://github.com/luispabon/superagent-retry-delay.git"
   },
+  "main": "src/index",
   "dependencies": {},
   "peerDependencies": {
     "superagent": "~3.5.0"
@@ -33,6 +34,5 @@
   "scripts": {
     "test": "node_modules/.bin/mocha --recursive --timeout=20000 tests/",
     "lint": "node_modules/.bin/eslint src tests"
-  },
-  "main": "src/index"
+  }
 }
diff --git a/tests/test.js b/tests/test.js
@@ -1,24 +1,23 @@
+/* eslint-env mocha */
+
 const express = require('express')
 
-const agent = require('superagent');
-require('../')(agent);
+const agent = require('superagent')
+require('../')(agent)
 
-const should = require('should')
-const assert = require('assert')
+require('should')
 const http = require('http')
 
 http.globalAgent.maxSockets = 2000
 
 describe('superagent-retry-delay', function () {
-
   describe('not-errors', function () {
     let requests = 0
     const port = 10410
     const app = express()
     let server
 
     before(function (done) {
-
       app.get('/', function (req, res, next) {
         requests++
         res.send('hello!')
@@ -50,7 +49,6 @@ describe('superagent-retry-delay', function () {
 
     before(function (done) {
       app.get('/', function (req, res, next) {
-
         requests++
         if (requests === 1) {
           res.sendStatus(401)
@@ -65,7 +63,6 @@ describe('superagent-retry-delay', function () {
     })
 
     it('should not retry on handled errors', function (done) {
-
       agent
         .get('http://localhost:' + port)
         .retry(5, 13, [404])
@@ -86,7 +83,6 @@ describe('superagent-retry-delay', function () {
     let server
 
     before(function (done) {
-
       app.get('/', function (req, res, next) {
         requests++
         if (requests > 4) {
@@ -100,11 +96,13 @@ describe('superagent-retry-delay', function () {
     })
 
     it('should retry on errors', function (done) {
-
       agent
         .get('http://localhost:' + port)
         .end(function (err, res) {
           res.status.should.eql(503)
+
+          // appease eslint, do nothing with error to allow it to bubble up
+          if (err) { }
         })
 
       agent
@@ -139,11 +137,13 @@ describe('superagent-retry-delay', function () {
     })
 
     it('should retry on errors', function (done) {
-
       agent
         .get('http://localhost:' + port)
         .end(function (err, res) {
           res.status.should.eql(500)
+
+          // appease eslint, do nothing with error to allow it to bubble up
+          if (err) { }
         })
 
       agent
@@ -167,7 +167,6 @@ describe('superagent-retry-delay', function () {
 
     before(function (done) {
       app.get('/', function (req, res, next) {
-
         requests++
         if (requests > 4) {
           res.send('hello!')
@@ -180,11 +179,13 @@ describe('superagent-retry-delay', function () {
     })
 
     it('should retry on errors', function (done) {
-
       agent
         .get('http://localhost:' + port)
         .end(function (err, res) {
           res.status.should.eql(404)
+
+          // appease eslint, do nothing with error to allow it to bubble up
+          if (err) { }
         })
 
       agent
@@ -208,7 +209,6 @@ describe('superagent-retry-delay', function () {
 
     before(function (done) {
       app.get('/', function (req, res, next) {
-
         requests++
         if (requests > 4) {
           res.send('hello!')
@@ -221,11 +221,13 @@ describe('superagent-retry-delay', function () {
     })
 
     it('should retry on errors', function (done) {
-
       agent
         .get('http://localhost:' + port)
         .end(function (err, res) {
           res.status.should.eql(401)
+
+          // appease eslint, do nothing with error to allow it to bubble up
+          if (err) { }
         })
 
       agent