codeceptjs 3.6.7 → 4.0.0-beta.2

package/lib/helper/REST.js

@@ -1,9 +1,8 @@
-const axios = require('axios').default
-const Helper = require('@codeceptjs/helper')
-const { Agent } = require('https')
-const Secret = require('../secret')
-
-const { beautify } = require('../utils')
+import { default as axios } from 'axios';
+import Helper from '@codeceptjs/helper';
+import Secret from '../secret.js';
+import { beautify } from '../utils.js';
+import { output } from '../output.js';
 
 /**
  * ## Configuration
@@ -11,16 +10,14 @@ const { beautify } = require('../utils')
  * @typedef RESTConfig
  * @type {object}
  * @prop {string} [endpoint] - API base URL
- * @prop {boolean} [prettyPrintJson=false] - pretty print json for response/request on console logs.
- * @prop {boolean} [printCurl=false] - print cURL request on console logs. False by default.
- * @prop {number} [timeout=1000] - timeout for requests in milliseconds. 10000ms by default.
- * @prop {object} [defaultHeaders] - a list of default headers.
- * @prop {object} [httpAgent] - create an agent with SSL certificate
- * @prop {function} [onRequest] - an async function which can update request object.
- * @prop {function} [onResponse] - an async function which can update response object.
+ * @prop {boolean} [prettyPrintJson=false] - pretty print json for response/request on console logs
+ * @prop {number} [timeout=1000] - timeout for requests in milliseconds. 10000ms by default
+ * @prop {object} [defaultHeaders] - a list of default headers
+ * @prop {function} [onRequest] - a async function which can update request object.
+ * @prop {function} [onResponse] - a async function which can update response object.
  * @prop {number} [maxUploadFileSize] - set the max content file size in MB when performing api calls.
  */
-const config = {}
+const config = {};
 
 /**
  * REST helper allows to send additional requests to the REST API during acceptance tests.
@@ -44,41 +41,6 @@ const config = {}
  *}
  * ```
  *
- *  With httpAgent
- *
- * ```js
- * {
- *   helpers: {
- *     REST: {
- *       endpoint: 'http://site.com/api',
- *       prettyPrintJson: true,
- *       httpAgent: {
- *          key: fs.readFileSync(__dirname + '/path/to/keyfile.key'),
- *          cert: fs.readFileSync(__dirname + '/path/to/certfile.cert'),
- *          rejectUnauthorized: false,
- *          keepAlive: true
- *       }
- *     }
- *   }
- * }
- * ```
- *
- * ```js
- * {
- *   helpers: {
- *     REST: {
- *       endpoint: 'http://site.com/api',
- *       prettyPrintJson: true,
- *       httpAgent: {
- *          ca: fs.readFileSync(__dirname + '/path/to/ca.pem'),
- *          rejectUnauthorized: false,
- *          keepAlive: true
- *       }
- *     }
- *   }
- * }
- * ```
- *
  * ## Access From Helpers
  *
  * Send REST requests by accessing `_executeRequest` method:
@@ -94,7 +56,7 @@ const config = {}
  */
 class REST extends Helper {
   constructor(config) {
-    super(config)
+    super(config);
     this.options = {
       timeout: 10000,
       defaultHeaders: {},
@@ -102,55 +64,39 @@ class REST extends Helper {
       prettyPrintJson: false,
       onRequest: null,
       onResponse: null,
-    }
+    };
 
     if (this.options.maxContentLength) {
-      const maxContentLength = this.options.maxUploadFileSize * 1024 * 1024
-      this.options.maxContentLength = maxContentLength
-      this.options.maxBodyLength = maxContentLength
+      const maxContentLength = this.options.maxUploadFileSize * 1024 * 1024;
+      this.options.maxContentLength = maxContentLength;
+      this.options.maxBodyLength = maxContentLength;
     }
 
     // override defaults with config
-    this._setConfig(config)
-
-    this.headers = { ...this.options.defaultHeaders }
-
-    // Create an agent with SSL certificate
-    if (this.options.httpAgent) {
-      // if one of those keys is there, all good to go
-      if (this.options.httpAgent.ca || this.options.httpAgent.key || this.options.httpAgent.cert) {
-        this.httpsAgent = new Agent(this.options.httpAgent)
-      } else {
-        // otherwise, throws an error of httpAgent config
-        throw Error('Please recheck your httpAgent config!')
-      }
-    }
+    this._setConfig(config);
 
-    this.axios = this.httpsAgent ? axios.create({ httpsAgent: this.httpsAgent }) : axios.create()
+    this.headers = { ...this.options.defaultHeaders };
+    this.axios = axios.create();
     // @ts-ignore
-    this.axios.defaults.headers = this.options.defaultHeaders
+    this.axios.defaults.headers = this.options.defaultHeaders;
   }
 
   static _config() {
     return [
-      {
-        name: 'endpoint',
-        message: 'Endpoint of API you are going to test',
-        default: 'http://localhost:3000/api',
-      },
-    ]
+      { name: 'endpoint', message: 'Endpoint of API you are going to test', default: 'http://localhost:3000/api' },
+    ];
   }
 
   static _checkRequirements() {
     try {
-      require('axios')
+      require('axios');
     } catch (e) {
-      return ['axios']
+      return ['axios'];
     }
   }
 
   _before() {
-    this.headers = { ...this.options.defaultHeaders }
+    this.headers = { ...this.options.defaultHeaders };
   }
 
   /**
@@ -159,7 +105,7 @@ class REST extends Helper {
    * @param {object} headers headers list
    */
   haveRequestHeaders(headers) {
-    this.headers = { ...this.headers, ...headers }
+    this.headers = { ...this.headers, ...headers };
   }
 
   /**
@@ -173,7 +119,7 @@ class REST extends Helper {
    * @param {string | CodeceptJS.Secret} accessToken  Bearer access token
    */
   amBearerAuthenticated(accessToken) {
-    this.haveRequestHeaders({ Authorization: `Bearer ${accessToken}` })
+    this.haveRequestHeaders({ Authorization: `Bearer ${accessToken}` });
   }
 
   /**
@@ -185,65 +131,54 @@ class REST extends Helper {
    */
   async _executeRequest(request) {
     // Add custom headers. They can be set by amBearerAuthenticated() or haveRequestHeaders()
-    request.headers = { ...this.headers, ...request.headers }
+    request.headers = { ...this.headers, ...request.headers };
 
-    const _debugRequest = { ...request }
-    this.axios.defaults.timeout = request.timeout || this.options.timeout
+    const _debugRequest = { ...request };
+    this.axios.defaults.timeout = request.timeout || this.options.timeout;
 
     if (this.headers && this.headers.auth) {
-      request.auth = this.headers.auth
+      request.auth = this.headers.auth;
     }
 
     if (typeof request.data === 'object') {
-      const returnedValue = {}
+      const returnedValue = {};
       for (const [key, value] of Object.entries(request.data)) {
-        returnedValue[key] = value
-        if (value instanceof Secret) returnedValue[key] = value.getMasked()
+        returnedValue[key] = value;
+        if (value instanceof Secret) returnedValue[key] = value.getMasked();
       }
-      _debugRequest.data = returnedValue
+      _debugRequest.data = returnedValue;
     }
 
     if (request.data instanceof Secret) {
-      _debugRequest.data = '*****'
-      request.data =
-        typeof request.data === 'object' && !(request.data instanceof Secret)
-          ? { ...request.data.toString() }
-          : request.data.toString()
+      _debugRequest.data = '*****';
+      request.data = (typeof request.data === 'object' && !(request.data instanceof Secret)) ? { ...request.data.toString() } : request.data.toString();
     }
 
-    if (typeof request.data === 'string') {
+    if ((typeof request.data) === 'string') {
       if (!request.headers || !request.headers['Content-Type']) {
-        request.headers = { ...request.headers, ...{ 'Content-Type': 'application/x-www-form-urlencoded' } }
+        request.headers = { ...request.headers, ...{ 'Content-Type': 'application/x-www-form-urlencoded' } };
       }
     }
 
     if (this.config.onRequest) {
-      await this.config.onRequest(request)
+      await this.config.onRequest(request);
     }
 
-    this.options.prettyPrintJson
-      ? this.debugSection('Request', beautify(JSON.stringify(_debugRequest)))
-      : this.debugSection('Request', JSON.stringify(_debugRequest))
+    this.options.prettyPrintJson ? output.debugSection('Request', beautify(JSON.stringify(_debugRequest))) : output.debugSection('Request', JSON.stringify(_debugRequest));
 
-    if (this.options.printCurl) {
-      this.debugSection('CURL Request', curlize(request))
-    }
-
-    let response
+    let response;
     try {
-      response = await this.axios(request)
+      response = await this.axios(request);
     } catch (err) {
-      if (!err.response) throw err
-      this.debugSection('Response', `Response error. Status code: ${err.response.status}`)
-      response = err.response
+      if (!err.response) throw err;
+      output.debugSection('Response', `Response error. Status code: ${err.response.status}`);
+      response = err.response;
     }
     if (this.config.onResponse) {
-      await this.config.onResponse(response)
+      await this.config.onResponse(response);
     }
-    this.options.prettyPrintJson
-      ? this.debugSection('Response', beautify(JSON.stringify(response.data)))
-      : this.debugSection('Response', JSON.stringify(response.data))
-    return response
+    this.options.prettyPrintJson ? output.debugSection('Response', beautify(JSON.stringify(response.data))) : output.debugSection('Response', JSON.stringify(response.data));
+    return response;
   }
 
   /**
@@ -252,7 +187,7 @@ class REST extends Helper {
    * @param {*} url
    */
   _url(url) {
-    return /^\w+\:\/\//.test(url) ? url : this.options.endpoint + url
+    return /^\w+\:\/\//.test(url) ? url : this.options.endpoint + url;
   }
 
   /**
@@ -265,7 +200,7 @@ class REST extends Helper {
    * @param {number} newTimeout - timeout in milliseconds
    */
   setRequestTimeout(newTimeout) {
-    this.options.timeout = newTimeout
+    this.options.timeout = newTimeout;
   }
 
   /**
@@ -284,8 +219,8 @@ class REST extends Helper {
     const request = {
       baseURL: this._url(url),
       headers,
-    }
-    return this._executeRequest(request)
+    };
+    return this._executeRequest(request);
   }
 
   /**
@@ -311,14 +246,14 @@ class REST extends Helper {
       method: 'POST',
       data: payload,
       headers,
-    }
+    };
 
     if (this.options.maxContentLength) {
-      request.maxContentLength = this.options.maxContentLength
-      request.maxBodyLength = this.options.maxContentLength
+      request.maxContentLength = this.options.maxContentLength;
+      request.maxBodyLength = this.options.maxContentLength;
     }
 
-    return this._executeRequest(request)
+    return this._executeRequest(request);
   }
 
   /**
@@ -344,14 +279,14 @@ class REST extends Helper {
       method: 'PATCH',
       data: payload,
       headers,
-    }
+    };
 
     if (this.options.maxContentLength) {
-      request.maxContentLength = this.options.maxContentLength
-      request.maxBodyLength = this.options.maxBodyLength
+      request.maxContentLength = this.options.maxContentLength;
+      request.maxBodyLength = this.options.maxBodyLength;
     }
 
-    return this._executeRequest(request)
+    return this._executeRequest(request);
   }
 
   /**
@@ -377,14 +312,14 @@ class REST extends Helper {
       method: 'PUT',
       data: payload,
       headers,
-    }
+    };
 
     if (this.options.maxContentLength) {
-      request.maxContentLength = this.options.maxContentLength
-      request.maxBodyLength = this.options.maxBodyLength
+      request.maxContentLength = this.options.maxContentLength;
+      request.maxBodyLength = this.options.maxBodyLength;
     }
 
-    return this._executeRequest(request)
+    return this._executeRequest(request);
   }
 
   /**
@@ -404,35 +339,9 @@ class REST extends Helper {
       baseURL: this._url(url),
       method: 'DELETE',
       headers,
-    }
-
-    return this._executeRequest(request)
-  }
-}
-
-module.exports = REST
-
-function curlize(request) {
-  if (request.data?.constructor.name.toLowerCase() === 'formdata')
-    return 'cURL is not printed as the request body is not a JSON'
-  let curl =
-    `curl --location --request ${request.method ? request.method.toUpperCase() : 'GET'} ${request.baseURL} `.replace(
-      "'",
-      '',
-    )
-
-  if (request.headers) {
-    Object.entries(request.headers).forEach(([key, value]) => {
-      curl += `-H "${key}: ${value}" `
-    })
-  }
-
-  if (!curl.toLowerCase().includes('content-type: application/json')) {
-    curl += '-H "Content-Type: application/json" '
-  }
+    };
 
-  if (request.data) {
-    curl += `-d '${JSON.stringify(request.data)}'`
+    return this._executeRequest(request);
   }
-  return curl
 }
+export default REST;

package/lib/helper/SoftExpectHelper.js

@@ -1,4 +1,4 @@
-const ExpectHelper = require('./ExpectHelper')
+import ExpectHelper from './ExpectHelper.js'
 
 /**
  * SoftAssertHelper is a utility class for performing soft assertions.
@@ -378,4 +378,4 @@ class SoftAssertHelper extends ExpectHelper {
     this.softAssert(() => this.expectMatchesPattern(actualValue, expectedPattern, customErrorMsg), customErrorMsg)
   }
 }
-module.exports = SoftAssertHelper
+export default SoftAssertHelper