codeceptjs 3.3.1 → 3.3.4

package/docs/webapi/waitForClickable.mustache

@@ -8,4 +8,4 @@ I.waitForClickable('.btn.continue', 5); // wait for 5 secs
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForDetached.mustache

@@ -7,4 +7,4 @@ I.waitForDetached('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForElement.mustache

@@ -8,4 +8,4 @@ I.waitForElement('.btn.continue', 5); // wait for 5 secs
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForEnabled.mustache

@@ -3,4 +3,4 @@ Element can be located by CSS or XPath.
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional) time in seconds to wait, 1 by default.
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForFunction.mustache

@@ -14,4 +14,4 @@ I.waitForFunction((count) => window.requests == count, [3], 5) // pass args and
 @param {string|function} fn to be executed in browser context.
 @param {any[]|number} [argsOrSec] (optional, `1` by default) arguments for function or seconds.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForInvisible.mustache

@@ -7,4 +7,4 @@ I.waitForInvisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForText.mustache

@@ -10,4 +10,4 @@ I.waitForText('Thank you, form has been submitted', 5, '#modal');
 @param {string }text to wait for.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
 @param {CodeceptJS.LocatorOrString} [context] (optional) element located by CSS|XPath|strict locator.
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForValue.mustache

@@ -7,4 +7,4 @@ I.waitForValue('//input', "GoodValue");
 @param {LocatorOrString} field input field.
 @param {string }value expected value.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForVisible.mustache

@@ -7,4 +7,4 @@ I.waitForVisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitInUrl.mustache

@@ -6,4 +6,4 @@ I.waitInUrl('/info', 2);
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitNumberOfVisibleElements.mustache

@@ -7,4 +7,4 @@ I.waitNumberOfVisibleElements('a', 3);
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} num number of elements.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitToHide.mustache

@@ -7,4 +7,4 @@ I.waitToHide('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitUrlEquals.mustache

@@ -7,4 +7,4 @@ I.waitUrlEquals('http://127.0.0.1:8000/info');
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@return {Promise<any>}
+[!] returns a _promise_ which is synchronized internally by recorder

package/lib/cli.js

@@ -19,7 +19,7 @@ class Cli extends Base {
     if (opts.debug) level = 2;
     if (opts.verbose) level = 3;
     output.level(level);
-    output.print(`CodeceptJS v${require('./codecept').version()}`);
+    output.print(`CodeceptJS v${require('./codecept').version()} ${output.standWithUkraine()}`);
     output.print(`Using test root "${global.codecept_dir}"`);
 
     const showSteps = level >= 1;

package/lib/command/interactive.js

@@ -21,7 +21,7 @@ module.exports = async function (path, options) {
 
     if (options.verbose) output.level(3);
 
-    output.print('String interactive shell for current suite...');
+    output.print('Starting interactive shell for current suite...');
     recorder.start();
     event.emit(event.suite.before, {
       fullTitle: () => 'Interactive Shell',

package/lib/command/run-workers.js

@@ -25,7 +25,7 @@ module.exports = async function (workerCount, options) {
 
   const numberOfWorkers = parseInt(workerCount, 10);
 
-  output.print(`CodeceptJS v${require('../codecept').version()}`);
+  output.print(`CodeceptJS v${require('../codecept').version()} ${output.standWithUkraine()}`);
   output.print(`Running tests in ${output.styles.bold(numberOfWorkers)} workers...`);
   output.print();
 

package/lib/command/workers/runTests.js

@@ -114,6 +114,13 @@ function initializeListeners() {
       parent.title = test.parent.title;
     }
 
+    if (test.opts) {
+      Object.keys(test.opts).forEach(k => {
+        if (typeof test.opts[k] === 'object') delete test.opts[k];
+        if (typeof test.opts[k] === 'function') delete test.opts[k];
+      });
+    }
+
     return {
       opts: test.opts || {},
       tags: test.tags || [],
@@ -148,6 +155,14 @@ function initializeListeners() {
     if (step.metaStep) {
       parent.title = step.metaStep.actor;
     }
+
+    if (step.opts) {
+      Object.keys(step.opts).forEach(k => {
+        if (typeof step.opts[k] === 'object') delete step.opts[k];
+        if (typeof step.opts[k] === 'function') delete step.opts[k];
+      });
+    }
+
     return {
       opts: step.opts || {},
       workerIndex,

package/lib/helper/Appium.js

@@ -332,7 +332,6 @@ class Appium extends Webdriver {
    *
    * @param {*} caps
    * @param {*} fn
-   * @return {Promise<any>}
    */
   async runOnIOS(caps, fn) {
     if (this.platform !== 'ios') return;
@@ -375,7 +374,6 @@ class Appium extends Webdriver {
    *
    * @param {*} caps
    * @param {*} fn
-   * @return {Promise<any>}
    */
   async runOnAndroid(caps, fn) {
     if (this.platform !== 'android') return;
@@ -396,7 +394,6 @@ class Appium extends Webdriver {
    * ```
    *
    * @param {*} fn
-   * @return {Promise<any>}
    */
   /* eslint-disable */
   async runInWeb(fn) {
@@ -493,7 +490,6 @@ class Appium extends Webdriver {
    *
    * @param {string} appId
    * @param {string} [bundleId] ID of bundle
-   * @return {Promise<any>}
    */
   async removeApp(appId, bundleId) {
     onlyForApps.call(this, 'Android');
@@ -601,7 +597,6 @@ class Appium extends Webdriver {
    * ```
    *
    * @param {'LANDSCAPE'|'PORTRAIT'} orientation LANDSCAPE or PORTRAIT
-   * @return {Promise<any>}
    *
    * Appium: support Android and iOS
    */
@@ -730,7 +725,6 @@ class Appium extends Webdriver {
    * Switch to the specified context.
    *
    * @param {*} context the context to switch to
-   * @return {Promise<any>}
    */
   async _switchToContext(context) {
     return this.browser.switchContext(context);
@@ -836,7 +830,6 @@ class Appium extends Webdriver {
    * ```
    *
    * @param {object} settings object
-   * @return {Promise<any>}
    *
    * Appium: support Android and iOS
    */
@@ -861,7 +854,6 @@ class Appium extends Webdriver {
    *
    * @param {'tapOutside' | 'pressKey'} [strategy] Desired strategy to close keyboard (‘tapOutside’ or ‘pressKey’)
    * @param {string} [key] Optional key
-   * @return {Promise<any>}
    */
   async hideDeviceKeyboard(strategy, key) {
     onlyForApps.call(this);
@@ -984,7 +976,6 @@ class Appium extends Webdriver {
    *
    * @param {object} from
    * @param {object} to
-   * @return {Promise<any>}
    *
    * Appium: support Android and iOS
    */
@@ -1217,7 +1208,6 @@ class Appium extends Webdriver {
    * Appium: support Android and iOS
    *
    * @param {Array} actions Array of touch actions
-   * @return {Promise<any>}
    */
   async touchPerform(actions) {
     onlyForApps.call(this);

package/lib/helper/JSONResponse.js

@@ -1,3 +1,4 @@
+const assert = require('assert');
 const chai = require('chai');
 const joi = require('joi');
 const chaiDeepMatch = require('chai-deep-match');
@@ -173,12 +174,30 @@ class JSONResponse extends Helper {
    *
    * I.seeResponseContainsJson({ user: { email: 'jon@doe.com' } });
    * ```
+   * If an array is received, checks that at least one element contains JSON
+   * ```js
+   * // response.data == [{ user: { name: 'jon', email: 'jon@doe.com' } }]
+   *
+   * I.seeResponseContainsJson({ user: { email: 'jon@doe.com' } });
+   * ```
    *
    * @param {object} json
    */
   seeResponseContainsJson(json = {}) {
     this._checkResponseReady();
-    expect(this.response.data).to.deep.match(json);
+    if (Array.isArray(this.response.data)) {
+      let fails = 0;
+      for (const el of this.response.data) {
+        try {
+          expect(el).to.deep.match(json);
+        } catch (err) {
+          fails++;
+        }
+      }
+      assert.ok(fails < this.response.data.length, `No elements in array matched ${JSON.stringify(json)}`);
+    } else {
+      expect(this.response.data).to.deep.match(json);
+    }
   }
 
   /**
@@ -189,12 +208,22 @@ class JSONResponse extends Helper {
    *
    * I.dontSeeResponseContainsJson({ user: 2 });
    * ```
+   * If an array is received, checks that no element of array contains json:
+   * ```js
+   * // response.data == [{ user: 1 }, { user: 3 }]
+   *
+   * I.dontSeeResponseContainsJson({ user: 2 });
+   * ```
    *
    * @param {object} json
    */
   dontSeeResponseContainsJson(json = {}) {
     this._checkResponseReady();
-    expect(this.response.data).not.to.deep.match(json);
+    if (Array.isArray(this.response.data)) {
+      this.response.data.forEach(data => expect(data).not.to.deep.match(json));
+    } else {
+      expect(this.response.data).not.to.deep.match(json);
+    }
   }
 
   /**
@@ -206,11 +235,23 @@ class JSONResponse extends Helper {
    * I.seeResponseContainsKeys(['user']);
    * ```
    *
+   * If an array is received, check is performed for each element of array:
+   *
+   * ```js
+   * // response.data == [{ user: 'jon' }, { user: 'matt'}]
+   *
+   * I.seeResponseContainsKeys(['user']);
+   * ```
+   *
    * @param {array} keys
    */
   seeResponseContainsKeys(keys = []) {
     this._checkResponseReady();
-    expect(this.response.data).to.include.keys(keys);
+    if (Array.isArray(this.response.data)) {
+      this.response.data.forEach(data => expect(data).to.include.keys(keys));
+    } else {
+      expect(this.response.data).to.include.keys(keys);
+    }
   }
 
   /**

package/lib/helper/Playwright.js

@@ -167,7 +167,8 @@ const { createValueEngine, createDisabledEngine } = require('./extras/Playwright
  *      Playwright: {
  *        url: "http://localhost",
  *        chromium: {
- *          browserWSEndpoint: 'ws://localhost:9222/devtools/browser/c5aa6160-b5bc-4d53-bb49-6ecb36cd2e0a'
+ *          browserWSEndpoint: 'ws://localhost:9222/devtools/browser/c5aa6160-b5bc-4d53-bb49-6ecb36cd2e0a',
+ *          cdpConnection: false // default is false
  *        }
  *      }
  *    }
@@ -272,6 +273,7 @@ class Playwright extends Helper {
     this.sessionPages = {};
     this.activeSessionName = '';
     this.isElectron = false;
+    this.isCDPConnection = false;
     this.electronSessions = [];
     this.storageState = null;
 
@@ -347,6 +349,7 @@ class Playwright extends Helper {
     this.isRemoteBrowser = !!this.playwrightOptions.browserWSEndpoint;
     this.isElectron = this.options.browser === 'electron';
     this.userDataDir = this.playwrightOptions.userDataDir;
+    this.isCDPConnection = this.playwrightOptions.cdpConnection;
     popupStore.defaultAction = this.options.defaultPopupAction;
   }
 
@@ -553,8 +556,7 @@ class Playwright extends Helper {
   * ```
   *
   * @param {string} description used to show in logs.
-  * @param {function} fn async function that executed with Playwright helper as argument
-  * @return {Promise<any>}
+  * @param {function} fn async function that executed with Playwright helper as argumen
   */
   usePlaywrightTo(description, fn) {
     return this._useTo(...arguments);
@@ -569,7 +571,6 @@ class Playwright extends Helper {
    * I.click('#triggerPopup');
    * I.acceptPopup();
    * ```
-   * @return {Promise<any>}
    */
   amAcceptingPopups() {
     popupStore.actionType = 'accept';
@@ -579,7 +580,6 @@ class Playwright extends Helper {
    * Accepts the active JavaScript native popup window, as created by window.alert|window.confirm|window.prompt.
    * Don't confuse popups with modal windows, as created by [various
    * libraries](http://jster.net/category/windows-modals-popups).
-   * @return {Promise<any>}
    */
   acceptPopup() {
     popupStore.assertPopupActionType('accept');
@@ -594,7 +594,6 @@ class Playwright extends Helper {
    * I.click('#triggerPopup');
    * I.cancelPopup();
    * ```
-   * @return {Promise<any>}
    */
   amCancellingPopups() {
     popupStore.actionType = 'cancel';
@@ -602,7 +601,6 @@ class Playwright extends Helper {
 
   /**
    * Dismisses the active JavaScript popup, as created by window.alert|window.confirm|window.prompt.
-   * @return {Promise<any>}
    */
   cancelPopup() {
     popupStore.assertPopupActionType('cancel');
@@ -620,7 +618,6 @@ class Playwright extends Helper {
   /**
    * Set current page
    * @param {object} page page to set
-   * @return {Promise<any>}
    */
   async _setPage(page) {
     page = await page;
@@ -645,7 +642,6 @@ class Playwright extends Helper {
   /**
    * Add the 'dialog' event listener to a page
    * @page {playwright.Page}
-   * @return {Promise<any>}
    *
    * The popup listener handles the dialog with the predefined action when it appears on the page.
    * It also saves a reference to the object which is used in seeInPopup.
@@ -676,7 +672,6 @@ class Playwright extends Helper {
 
   /**
    * Gets page URL including hash.
-   * @return {Promise<any>}
    */
   async _getPageUrl() {
     return this.executeScript(() => window.location.href);
@@ -700,6 +695,15 @@ class Playwright extends Helper {
   async _startBrowser() {
     if (this.isElectron) {
       this.browser = await playwright._electron.launch(this.playwrightOptions);
+    } else if (this.isRemoteBrowser && this.isCDPConnection) {
+      try {
+        this.browser = await playwright[this.options.browser].connectOverCDP(this.playwrightOptions);
+      } catch (err) {
+        if (err.toString().indexOf('ECONNREFUSED')) {
+          throw new RemoteBrowserConnectionRefused(err);
+        }
+        throw err;
+      }
     } else if (this.isRemoteBrowser) {
       try {
         this.browser = await playwright[this.options.browser].connect(this.playwrightOptions);
@@ -849,7 +853,6 @@ class Playwright extends Helper {
    * ```
    *
    * @param {object} customHeaders headers to set
-   * @return {Promise<any>}
    */
   async haveRequestHeaders(customHeaders) {
     if (!customHeaders) {
@@ -996,7 +999,6 @@ class Playwright extends Helper {
    * ```js
    * const elements = await this.helpers['Playwright']._locate({name: 'password'});
    * ```
-   * @return {Promise<any>}
    */
   async _locate(locator) {
     const context = await this.context || await this._getContext();
@@ -1010,7 +1012,6 @@ class Playwright extends Helper {
    * ```js
    * this.helpers['Playwright']._locateCheckable('I agree with terms and conditions').then // ...
    * ```
-   * @return {Promise<any>}
    */
   async _locateCheckable(locator, providedContext = null) {
     const context = providedContext || await this._getContext();
@@ -1025,7 +1026,6 @@ class Playwright extends Helper {
    * ```js
    * this.helpers['Playwright']._locateClickable('Next page').then // ...
    * ```
-   * @return {Promise<any>}
    */
   async _locateClickable(locator) {
     const context = await this._getContext();
@@ -1038,7 +1038,6 @@ class Playwright extends Helper {
    * ```js
    * this.helpers['Playwright']._locateFields('Your email').then // ...
    * ```
-   * @return {Promise<any>}
    */
   async _locateFields(locator) {
     return findFields.call(this, locator);
@@ -1053,7 +1052,6 @@ class Playwright extends Helper {
    * ```
    *
    * @param {number} [num=1]
-   * @return {Promise<any>}
    */
   async switchToNextTab(num = 1) {
     if (this.isElectron) {
@@ -1068,6 +1066,7 @@ class Playwright extends Helper {
     if (!page) {
       throw new Error(`There is no ability to switch to next tab with offset ${num}`);
     }
+    targetCreatedHandler.call(this, page);
     await this._setPage(page);
     return this._waitForAction();
   }
@@ -1080,7 +1079,6 @@ class Playwright extends Helper {
    * I.switchToPreviousTab(2);
    * ```
    * @param {number} [num=1]
-   * @return {Promise<any>}
    */
   async switchToPreviousTab(num = 1) {
     if (this.isElectron) {
@@ -1105,7 +1103,6 @@ class Playwright extends Helper {
    * ```js
    * I.closeCurrentTab();
    * ```
-   * @return {Promise<any>}
    */
   async closeCurrentTab() {
     if (this.isElectron) {
@@ -1123,7 +1120,6 @@ class Playwright extends Helper {
    * ```js
    * I.closeOtherTabs();
    * ```
-   * @return {Promise<any>}
    */
   async closeOtherTabs() {
     const pages = await this.browserContext.pages();
@@ -1148,13 +1144,14 @@ class Playwright extends Helper {
    * // enable mobile
    * I.openNewTab({ isMobile: true });
    * ```
-   * @return {Promise<any>}
    */
   async openNewTab(options) {
     if (this.isElectron) {
       throw new Error('Cannot open new tabs inside an Electron container');
     }
-    await this._setPage(await this.browserContext.newPage(options));
+    const page = await this.browserContext.newPage(options);
+    targetCreatedHandler.call(this, page);
+    await this._setPage(page);
     return this._waitForAction();
   }
 
@@ -1255,7 +1252,6 @@ class Playwright extends Helper {
 
   /**
    * Clicks link and waits for navigation (deprecated)
-   * @return {Promise<any>}
    */
   async clickLink(locator, context = null) {
     console.log('clickLink deprecated: Playwright automatically waits for navigation to happen.');
@@ -1577,9 +1573,11 @@ class Playwright extends Helper {
    * Get JS log from browser.
    *
    * ```js
-   * let logs = await I.grabBrowserLogs();
-   * console.log(JSON.stringify(logs))
+   * const logs = await I.grabBrowserLogs();
+   * const errors = logs.map(l => ({ type: l.type(), text: l.text() })).filter(l => l.type === 'error');
+   * console.log(JSON.stringify(errors));
    * ```
+   * [Learn more about console messages](https://playwright.dev/docs/api/class-consolemessage)
    * @return {Promise<any[]>}
    */
   async grabBrowserLogs() {
@@ -1702,7 +1700,6 @@ class Playwright extends Helper {
    *
    * @param {string|function} fn function to be executed in browser context.
    * @param {any} [arg] optional argument to pass to the function
-   * @return {Promise<any>}
    */
   async executeScript(fn, arg) {
     let context = this.page;
@@ -2303,7 +2300,6 @@ class Playwright extends Helper {
    *
    * @param {string|function} urlOrPredicate
    * @param {?number} [sec=null] seconds to wait
-   * @return {Promise<any>}
    */
   async waitForRequest(urlOrPredicate, sec = null) {
     const timeout = sec ? sec * 1000 : this.options.waitForTimeout;
@@ -2320,7 +2316,6 @@ class Playwright extends Helper {
    *
    * @param {string|function} urlOrPredicate
    * @param {?number} [sec=null] number of seconds to wait
-   * @return {Promise<any>}
    */
   async waitForResponse(urlOrPredicate, sec = null) {
     const timeout = sec ? sec * 1000 : this.options.waitForTimeout;
@@ -2392,7 +2387,6 @@ class Playwright extends Helper {
    * See [Playwright's reference](https://playwright.dev/docs/api/class-page?_highlight=waitfornavi#pagewaitfornavigationoptions)
    *
    * @param {*} opts
-   * @return {Promise<any>}
    */
   async waitForNavigation(opts = {}) {
     opts = {
@@ -2464,8 +2458,7 @@ class Playwright extends Helper {
   * This method allows intercepting and mocking requests & responses. [Learn more about it](https://playwright.dev/docs/network#handle-requests)
   *
   * @param {string|RegExp} [url] URL, regex or pattern for to match URL
-  * @param {function} [handler] a function to process request
-  * @return {Promise<any>}
+  * @param {function} [handler] a function to process reques
   */
   async mockRoute(url, handler) {
     return this.browserContext.route(...arguments);
@@ -2481,8 +2474,7 @@ class Playwright extends Helper {
   * If no handler is passed, all mock requests for the rote are disabled.
   *
   * @param {string|RegExp} [url] URL, regex or pattern for to match URL
-  * @param {function} [handler] a function to process request
-  * @return {Promise<any>}
+  * @param {function} [handler] a function to process reques
   */
   async stopMockingRoute(url, handler) {
     return this.browserContext.unroute(...arguments);

package/lib/helper/REST.js

@@ -2,6 +2,7 @@ const axios = require('axios').default;
 const Secret = require('../secret');
 
 const Helper = require('../helper');
+const { beautify } = require('../utils');
 
 /**
  * REST helper allows to send additional requests to the REST API during acceptance tests.
@@ -10,6 +11,7 @@ const Helper = require('../helper');
  * ## Configuration
  *
  * * endpoint: API base URL
+ * * prettyPrintJson: pretty print json for response/request on console logs
  * * timeout: timeout for requests in milliseconds. 10000ms by default
  * * defaultHeaders: a list of default headers
  * * onRequest: a async function which can update request object.
@@ -22,6 +24,7 @@ const Helper = require('../helper');
  *   helpers: {
  *     REST: {
  *       endpoint: 'http://site.com/api',
+ *       prettyPrintJson: true,
  *       onRequest: (request) => {
  *       request.headers.auth = '123';
  *     }
@@ -49,6 +52,7 @@ class REST extends Helper {
       timeout: 10000,
       defaultHeaders: {},
       endpoint: '',
+      prettyPrintJson: false,
     };
 
     if (this.options.maxContentLength) {
@@ -87,7 +91,7 @@ class REST extends Helper {
    * @param {object} headers headers list
    */
   haveRequestHeaders(headers) {
-    this.headers = { ...headers, ...this.headers };
+    this.headers = { ...this.headers, ...headers };
   }
 
   /**
@@ -113,7 +117,7 @@ class REST extends Helper {
    */
   async _executeRequest(request) {
     // Add custom headers. They can be set by amBearerAuthenticated() or haveRequestHeaders()
-    request.headers = { ...request.headers, ...this.headers };
+    request.headers = { ...this.headers, ...request.headers };
 
     const _debugRequest = { ...request };
     this.axios.defaults.timeout = request.timeout || this.options.timeout;
@@ -137,7 +141,7 @@ class REST extends Helper {
       await this.config.onRequest(request);
     }
 
-    this.debugSection('Request', JSON.stringify(_debugRequest));
+    this.options.prettyPrintJson ? this.debugSection('Request', beautify(JSON.stringify(_debugRequest))) : this.debugSection('Request', JSON.stringify(_debugRequest));
 
     let response;
     try {
@@ -150,7 +154,7 @@ class REST extends Helper {
     if (this.config.onResponse) {
       await this.config.onResponse(response);
     }
-    this.debugSection('Response', JSON.stringify(response.data));
+    this.options.prettyPrintJson ? this.debugSection('Response', beautify(JSON.stringify(response.data))) : this.debugSection('Response', JSON.stringify(response.data));
     return response;
   }