Merge pull request #288 from IBM/eslint-mocha

test: Configure eslint properly for Mocha tests
IBM · Jun 10, 2020 · 89e67e6 · 89e67e6
2 parents b1f3818 + 63ccb9d
commit 89e67e6
Show file tree

Hide file tree

Showing 32 changed files with 81 additions and 42 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,13 +1,37 @@
-module.exports =  { 
-    "extends": "airbnb-base",
-    env: {
-        node: true
-    },
-    rules: {
-        // Tweak rules set by airbnb config
-        'no-console': 'off', // allow console
-        'import/no-extraneous-dependencies': ["error", {"optionalDependencies": true}], // Allow optional dep import
-        // Warn unresolved imports ie: idb-connector import will be unresolved when on non IBM i system.
-        'import/no-unresolved': ['off', { commonjs: true }],
+module.exports = {
+  extends: 'airbnb-base',
+  plugins: [
+    'mocha',
+  ],
+  env: {
+    node: true,
+  },
+  rules: {
+    // Tweak rules set by airbnb config
+    // We need to allow use of console.log for verbose mode
+    'no-console': 'off',
+  },
+  overrides: [
+    {
+      files: ['test/**/*.js'],
+      env: {
+        node: true,
+        mocha: true,
+      },
+      extends: 'plugin:mocha/recommended',
+      rules: {
+        // These are set by airbnb-base, but go against Mocha conventions
+        // See https://mochajs.org/#arrow-functions
+        // and https://github.com/airbnb/javascript/issues/433
+        'func-names': 'off',
+        'prefer-arrow-callback': 'off',
+
+        // The following rules cause problems for our existing tests, so they are disabled for now:
+        'mocha/no-mocha-arrows': 'off',
+        'mocha/no-skipped-tests': 'off',
+        'mocha/no-hooks-for-single-case': 'off',
+        'mocha/no-identical-title': 'off',
       },
+    },
+  ],
 };
diff --git a/lib/transports/idbTransport.js b/lib/transports/idbTransport.js
@@ -18,7 +18,10 @@
 const idbCall = (config, xmlInput, cb) => {
   const {
     dbconn, dbstmt, IN, CLOB, CHAR, SQL_ATTR_DBC_SYS_NAMING, SQL_FALSE,
-  // eslint-disable-next-line global-require
+    // idb-connector is an optional dependency, since users may not use this transport
+    // thus we can't globally require it
+    // eslint-disable-next-line max-len
+    // eslint-disable-next-line global-require, import/no-extraneous-dependencies, import/no-unresolved
   } = require('idb-connector');
 
   const {

diff --git a/lib/transports/odbcTransport.js b/lib/transports/odbcTransport.js
@@ -16,7 +16,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 function odbcCall(config, xmlInput, done) {
-  // eslint-disable-next-line global-require
+  // odbc is an optional dependency, since users may not use this transport
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const odbc = require('odbc');
 
   const {

diff --git a/lib/transports/sshTransport.js b/lib/transports/sshTransport.js
@@ -16,7 +16,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 function sshCall(config, xmlIn, done) {
-  // eslint-disable-next-line global-require
+  // ssh2 is an optional dependency, since users may not use this transport
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const { Client } = require('ssh2');
 
   const {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "eslint": "^6.2.0",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-mocha": "^7.0.1",
     "mocha": "^6.2.3",
     "sinon": "^7.4.1",
     "standard-version": "^7.0.0"

diff --git a/test/functional/CommandCallFunctional.js b/test/functional/CommandCallFunctional.js
@@ -15,8 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
-
 const { expect } = require('chai');
 const { parseString } = require('xml2js');
 const { CommandCall, Connection } = require('../../lib/itoolkit');

diff --git a/test/functional/ProgramCallFunctional.js b/test/functional/ProgramCallFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 
 const { expect } = require('chai');
 const { parseString } = require('xml2js');

diff --git a/test/functional/checkObjectExists.js b/test/functional/checkObjectExists.js
@@ -3,7 +3,9 @@ const createLib = `CRTLIB LIB(${lib}) TYPE(*TEST) TEXT('Used to test Node.js too
 const findLib = `SELECT SCHEMA_NAME FROM qsys2.sysschemas WHERE SCHEMA_NAME = '${lib}'`;
 
 function checkObjectExistsSSH(config, object = {}, callback) {
-  /* eslint-disable global-require */
+  // ssh2 is an optional dependency, since users may not use this transport
+  // thus we can't globally require it
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const { Client } = require('ssh2');
 
   const client = new Client();
@@ -68,6 +70,9 @@ function checkObjectExistsSSH(config, object = {}, callback) {
 }
 
 function checkObjectExistsODBC(config, object = {}, callback) {
+  // odbc is an optional dependency, since users may not use this transport
+  // thus we can't globally require it
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const odbc = require('odbc');
 
   const connectionString = config.dsn || `DRIVER=IBM i Access ODBC Driver;SYSTEM=${config.host};UID=${config.username};PWD=${config.password};`;
@@ -110,6 +115,10 @@ function checkObjectExistsODBC(config, object = {}, callback) {
 }
 
 function checkObjectExistsIDB(config, object = {}, callback) {
+  // idb-connector is an optional dependency, since users may not use this transport
+  // thus we can't globally require it
+  // eslint-disable-next-line max-len
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies, import/no-unresolved
   const { dbconn, dbstmt } = require('idb-connector');
 
   /* eslint-disable new-cap */

diff --git a/test/functional/deprecated/commandsFunctional.js b/test/functional/deprecated/commandsFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 

diff --git a/test/functional/deprecated/iDataQueueFunctional.js b/test/functional/deprecated/iDataQueueFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iNetworkFunctional.js b/test/functional/deprecated/iNetworkFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iObjFunctional.js b/test/functional/deprecated/iObjFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iPgmFunctional.js b/test/functional/deprecated/iPgmFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iProdFunctional.js b/test/functional/deprecated/iProdFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iSqlFunctional.js b/test/functional/deprecated/iSqlFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 

diff --git a/test/functional/deprecated/iUserSpaceFunctional.js b/test/functional/deprecated/iUserSpaceFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/deprecated/iWorkFunctional.js b/test/functional/deprecated/iWorkFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iDataQueueFunctional.js b/test/functional/iDataQueueFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iNetworkFunctional.js b/test/functional/iNetworkFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iObjFunctional.js b/test/functional/iObjFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iProdFunctional.js b/test/functional/iProdFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iSqlFunctional.js b/test/functional/iSqlFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iUserSpaceFunctional.js b/test/functional/iUserSpaceFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/functional/iWorkFunctional.js b/test/functional/iWorkFunctional.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/CommandCallUnit.js b/test/unit/CommandCallUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 const { expect } = require('chai');
 const { CommandCall } = require('../../lib/itoolkit');
 

diff --git a/test/unit/ConnectionUnit.js b/test/unit/ConnectionUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/ProgamCallUnit.js b/test/unit/ProgamCallUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/deprecated/iConnUnit.js b/test/unit/deprecated/iConnUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/deprecated/iPgmUnit.js b/test/unit/deprecated/iPgmUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/deprecated/iSqlUnit.js b/test/unit/deprecated/iSqlUnit.js
@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');

diff --git a/test/unit/deprecated/xmlToJsonUnit.js b/test/unit/deprecated/xmlToJsonUnit.js
@@ -15,8 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
-
 const { expect } = require('chai');
 const { xmlToJson } = require('../../../lib/itoolkit');