resolve the path in filename

Author: kobenguyent

docs/helpers/Playwright.md

@@ -1817,30 +1817,11 @@ Optionally resize the window to the full available page `scrollHeight` and `scro
 ```js
 I.saveScreenshot('debug.png')
 I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
+I.saveScreenshot('customFolder/debug.png') //saves to customFolder/debug.png
 ```
 
 #### Parameters
 
-- `fileName` **[string][9]** file name to save.
-- `fullPage` **[boolean][26]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
-- `customPath` **[string][9]** (optional, `''` by default) custom path to save file.
-
-Returns **void** automatically synchronized promise through #recorder
-
-### saveScreenshotToPath
-
-Saves a screenshot to custom folder (set in codecept.conf.ts or codecept.conf.js).
-Filename is relative to custom folder.
-Optionally resize the window to the full available page `scrollHeight` and `scrollWidth` to capture the entire page by passing `true` in as the second argument.
-
-```js
-I.saveScreenshotToPath('output/custom', 'debug.png')
-I.saveScreenshotToPath('output/custom', 'debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
-```
-
-#### Parameters
-
-- `path` **[string][9]** custom path to save file.
 - `fileName` **[string][9]** file name to save.
 - `fullPage` **[boolean][26]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
 

docs/helpers/Puppeteer.md

@@ -1539,30 +1539,11 @@ Optionally resize the window to the full available page `scrollHeight` and `scro
 ```js
 I.saveScreenshot('debug.png')
 I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
+I.saveScreenshot('customFolder/debug.png') //saves to customFolder/debug.png
 ```
 
 #### Parameters
 
-- `fileName` **[string][6]** file name to save.
-- `fullPage` **[boolean][23]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
-- `customPath` **[string][6]** (optional, `''` by default) custom path to save file.
-
-Returns **void** automatically synchronized promise through #recorder
-
-### saveScreenshotToPath
-
-Saves a screenshot to custom folder (set in codecept.conf.ts or codecept.conf.js).
-Filename is relative to custom folder.
-Optionally resize the window to the full available page `scrollHeight` and `scrollWidth` to capture the entire page by passing `true` in as the second argument.
-
-```js
-I.saveScreenshotToPath('output/custom', 'debug.png')
-I.saveScreenshotToPath('output/custom', 'debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
-```
-
-#### Parameters
-
-- `path` **[string][6]** custom path to save file.
 - `fileName` **[string][6]** file name to save.
 - `fullPage` **[boolean][23]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
 

docs/helpers/WebDriver.md

@@ -1659,30 +1659,11 @@ Optionally resize the window to the full available page `scrollHeight` and `scro
 ```js
 I.saveScreenshot('debug.png')
 I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
+I.saveScreenshot('customFolder/debug.png') //saves to customFolder/debug.png
 ```
 
 #### Parameters
 
-- `fileName` **[string][18]** file name to save.
-- `fullPage` **[boolean][33]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
-- `customPath` **[string][18]** (optional, `''` by default) custom path to save file.
-
-Returns **void** automatically synchronized promise through #recorder
-
-### saveScreenshotToPath
-
-Saves a screenshot to custom folder (set in codecept.conf.ts or codecept.conf.js).
-Filename is relative to custom folder.
-Optionally resize the window to the full available page `scrollHeight` and `scrollWidth` to capture the entire page by passing `true` in as the second argument.
-
-```js
-I.saveScreenshotToPath('output/custom', 'debug.png')
-I.saveScreenshotToPath('output/custom', 'debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
-```
-
-#### Parameters
-
-- `path` **[string][18]** custom path to save file.
 - `fileName` **[string][18]** file name to save.
 - `fullPage` **[boolean][33]** (optional, `false` by default) flag to enable fullscreen screenshot mode.
 

docs/webapi/saveScreenshot.mustache

@@ -5,9 +5,9 @@ Optionally resize the window to the full available page `scrollHeight` and `scro
 ```js
 I.saveScreenshot('debug.png');
 I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
+I.saveScreenshot('customFolder/debug.png') //saves to customFolder/debug.png
 ```
 
 @param {string} fileName file name to save.
 @param {boolean} [fullPage=false] (optional, `false` by default) flag to enable fullscreen screenshot mode.
-@param {string} [customPath=''] (optional, `''` by default) custom path to save file.
 @returns {void} automatically synchronized promise through #recorder

docs/webapi/saveScreenshotToPath.mustache

@@ -2500,9 +2500,9 @@ class Playwright extends Helper {
   /**
    * {{> saveScreenshot }}
    */
-  async saveScreenshot(fileName, fullPage, customPath = '') {
+  async saveScreenshot(fileName, fullPage) {
     const fullPageOption = fullPage || this.options.fullPageScreenshots
-    let outputFile = screenshotOutputFolder(fileName, customPath)
+    let outputFile = screenshotOutputFolder(fileName)
 
     this.debugSection('Screenshot', relativeDir(outputFile))
 
@@ -2515,7 +2515,7 @@ class Playwright extends Helper {
     if (this.activeSessionName) {
       for (const sessionName in this.sessionPages) {
         const activeSessionPage = this.sessionPages[sessionName]
-        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`, customPath)
+        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`)
 
         this.debugSection('Screenshot', `${sessionName} - ${relativeDir(outputFile)}`)
 
@@ -2530,13 +2530,6 @@ class Playwright extends Helper {
     }
   }
 
-  /**
-   * {{> saveScreenshotToPath }}
-   */
-  async saveScreenshotToPath(path, fileName = '', fullPage) {
-    return this.saveScreenshot(fileName, fullPage, path)
-  }
-
   /**
    * Performs [api request](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get) using
    * the cookies from the current browser session.

lib/helper/Playwright.js

@@ -1992,9 +1992,9 @@ class Puppeteer extends Helper {
   /**
    * {{> saveScreenshot }}
    */
-  async saveScreenshot(fileName, fullPage, customPath = '') {
+  async saveScreenshot(fileName, fullPage) {
     const fullPageOption = fullPage || this.options.fullPageScreenshots
-    let outputFile = screenshotOutputFolder(fileName, customPath)
+    let outputFile = screenshotOutputFolder(fileName)
 
     this.debug(`Screenshot is saving to ${outputFile}`)
 
@@ -2007,7 +2007,7 @@ class Puppeteer extends Helper {
     if (this.activeSessionName) {
       for (const sessionName in this.sessionPages) {
         const activeSessionPage = this.sessionPages[sessionName]
-        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`, customPath)
+        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`)
 
         this.debug(`${sessionName} - Screenshot is saving to ${outputFile}`)
 
@@ -2022,13 +2022,6 @@ class Puppeteer extends Helper {
     }
   }
 
-  /**
-   * {{> saveScreenshotToPath }}
-   */
-  async saveScreenshotToPath(path, fileName = '', fullPage) {
-    return this.saveScreenshot(fileName, fullPage, path)
-  }
-
   async _failed(test) {
     await this._withinEnd()
 

lib/helper/Puppeteer.js

@@ -1798,15 +1798,15 @@ class WebDriver extends Helper {
   /**
    * {{> saveScreenshot }}
    */
-  async saveScreenshot(fileName, fullPage = false, customPath = '') {
-    let outputFile = screenshotOutputFolder(fileName, customPath)
+  async saveScreenshot(fileName, fullPage = false) {
+    let outputFile = screenshotOutputFolder(fileName)
 
     if (this.activeSessionName) {
       const browser = this.sessionWindows[this.activeSessionName]
 
       for (const sessionName in this.sessionWindows) {
         const activeSessionPage = this.sessionWindows[sessionName]
-        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`, customPath)
+        outputFile = screenshotOutputFolder(`${sessionName}_${fileName}`)
 
         this.debug(`${sessionName} - Screenshot is saving to ${outputFile}`)
 
@@ -1849,13 +1849,6 @@ class WebDriver extends Helper {
     return buffer
   }
 
-  /**
-   * {{> saveScreenshotToPath }}
-   */
-  async saveScreenshotToPath(path, fileName = '', fullPage) {
-    return this.saveScreenshot(fileName, fullPage, path)
-  }
-
   /**
    * Uses Selenium's JSON [cookie format](https://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object).
    * {{> setCookie }}

lib/helper/WebDriver.js

@@ -311,11 +311,11 @@ module.exports.deleteDir = function (dir_path) {
  * Returns absolute filename to save screenshot.
  * @param fileName {string} - filename.
  */
-module.exports.screenshotOutputFolder = function (fileName, customPath = '') {
+module.exports.screenshotOutputFolder = function (fileName) {
   const fileSep = path.sep
 
-  if (customPath.includes(fileSep)) {
-    return path.resolve(customPath, fileName)
+  if (fileName.includes(fileSep) && !(fileName.includes(global.output_dir) || fileName.includes(global.codecept_dir))) {
+    return path.resolve(fileName)
   }
 
   if (!fileName.includes(fileSep) || fileName.includes('record_')) {

lib/utils.js

@@ -330,7 +330,7 @@ describe('utils', () => {
     })
 
     it('saves screenshot to custom path', () => {
-      const _path = utils.screenshotOutputFolder('screenshot1.failed.png', '/Users/someuser/workbase/project1/custom_path/'.replace(/\//g, path.sep))
+      const _path = utils.screenshotOutputFolder('/Users/someuser/workbase/project1/custom_path/'.replace(/\//g, path.sep) + 'screenshot1.failed.png')
       if (os.platform() === 'win32') {
         expect(_path).eql(path.resolve(global.codecept_dir, '/Users/someuser/workbase/project1/custom_path/screenshot1.failed.png'))
       } else {