Refactor code due to eslint rules

Author: Maksym Shykov

.eslintrc.js

@@ -1,19 +1,25 @@
+'use strict';
+
 module.exports = {
   extends: [
-    '@macpaw/eslint-config-webservices/rules/base',
-    '@macpaw/eslint-config-webservices/rules/filenames',
-    '@macpaw/eslint-config-webservices/rules/promise',
+    '@macpaw/eslint-config-webservices-base',
   ],
-  parser: 'espree',
+
+  plugins: [
+    'async-await',
+  ],
+
+  env: {
+    node: true,
+    es6: true,
+    browser: true,
+  },
+
   parserOptions: {
-    ecmaVersion: 8,
     sourceType: 'script',
   },
-  plugins: ['async-await'],
+
   rules: {
-    strict: ['warn', 'global'],
-    'no-unused-expressions': ['off'],
-    'newline-after-var': ['off'],
-    'filenames/match-regex': ['off'],
+    'no-console': 'off',
   },
-};
+};

.npmrc

@@ -0,0 +1 @@
+@macpaw:registry=https://npm.pkg.github.com

Jenkinsfile

@@ -0,0 +1,29 @@
+NPM_CREDENTIALS_ID = '982beb9e-1cb8-4a93-90f7-2fd8dce6c097'
+GITHUB_PACKAGES_CREDENTIALS_ID = 'github-access-token'
+
+pipeline {
+  agent {
+    docker {
+      image 'node:10'
+      label 'docker'
+    }
+  }
+  stages {
+    stage('Install dependencies') {
+      environment {
+        NPM_TOKEN = credentials("$NPM_CREDENTIALS_ID")
+        GITHUB_PACKAGES_TOKEN = credentials("$GITHUB_PACKAGES_CREDENTIALS_ID")
+      }
+      steps {
+        sh 'npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN'
+        sh 'npm config set //npm.pkg.github.com/:_authToken=$GITHUB_PACKAGES_TOKEN'
+        sh 'yarn install'
+      }
+    }
+    stage('Lint code') {
+      steps {
+        sh 'npm run lint --silent'
+      }
+    }
+  }
+}

api-services/index.js

@@ -1,5 +1,13 @@
 'use strict';
 
+const logger = require('./lib/logger');
+const request = require('./lib/request');
+const requestHelper = require('./lib/request-helper');
+const waiters = require('./lib/waiters');
+
 module.exports = {
-  apiServices: require('./api-services/'),
+  logger,
+  request,
+  requestHelper,
+  waiters,
 };

index.js

@@ -2,6 +2,8 @@
 
 const requestHelper = require('./request-helper');
 
+const {browser} = global;
+
 module.exports = {
   get(url, options) {
     const response = browser.call(() => requestHelper.getResponseBody('GET', url, options));

api-services/libs/logger.js renamed to lib/logger.js

@@ -1,7 +1,9 @@
 'use strict';
 
 module.exports = {
-  *waitFor(func, strategy, {timeout = 90000, interval = 2500, message, time}) {
+  * waitFor(func, strategy, {
+    timeout = 90000, interval = 2500, message, time,
+  }) {
     const timeStart = Date.now();
 
     const getData = () => new Promise((resolve) => {
@@ -15,11 +17,11 @@ module.exports = {
     while (true) {
       if (strategy(result, time)) {
         return result;
-      } else if (Date.now() - timeStart < timeout) {
+      } if (Date.now() - timeStart < timeout) {
         result = yield getData();
       } else {
         throw new Error(message || 'Timeout reached');
       }
     }
   },
-};
+};

api-services/libs/request-helper.js renamed to lib/request-helper.js

@@ -1,7 +1,7 @@
 {
   "name": "qa-api-services",
   "version": "0.0.1",
-  "description": "QA API libraries for Macpaw projects",
+  "description": "QA API libraries for MacPaw projects",
   "main": "index.js",
   "author": "Volodymyr Dobrygin",
   "contributors": [
@@ -15,18 +15,19 @@
   },
   "license": "UNLICENSED",
   "scripts": {
-    "lint": "$(npm bin)/eslint --max-warnings 0 ."
+    "lint": "eslint ."
   },
   "dependencies": {
-    "chalk": "^2.4.1",
+    "chalk": "^4.1.0",
     "then-request": "^6.0.2"
   },
   "devDependencies": {
-    "@macpaw/eslint-config-webservices": "^1.1.0",
-    "babel-eslint": "^8.2.3",
-    "eslint": "^4.19.1",
-    "eslint-plugin-async-await": "0.0.0",
-    "eslint-plugin-filenames": "^1.2.0",
-    "eslint-plugin-promise": "^3.7.0"
+    "@macpaw/eslint-config-webservices": "^3.1.0",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^7.3.1",
+    "eslint-plugin-async-await": "^0.0.0",
+    "eslint-plugin-filenames": "^1.3.2",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-promise": "^4.2.1"
   }
 }