Screenshots path correction (#2049)

* fix screenshotOutputFolder's absolute path resolving

* fix screenshotOnFail's mocha dir absolute path resolving

Author: elukoyanov

lib/plugin/screenshotOnFail.js

@@ -99,7 +99,7 @@ module.exports = function (config) {
       try {
         if (options.reportDir) {
           fileName = path.join(options.reportDir, fileName);
-          const mochaReportDir = path.join(process.cwd(), options.reportDir);
+          const mochaReportDir = path.resolve(process.cwd(), options.reportDir);
           if (!fileExists(mochaReportDir)) {
             fs.mkdirSync(mochaReportDir);
           }

lib/utils.js

@@ -270,13 +270,17 @@ module.exports.deleteDir = function (dir_path) {
   }
 };
 
+/**
+ * Returns absolute filename to save screenshot.
+ * @param fileName {string} - filename.
+ */
 module.exports.screenshotOutputFolder = function (fileName) {
   const fileSep = path.sep;
 
   if (!fileName.includes(fileSep) || fileName.includes('record_')) {
     return path.join(global.output_dir, fileName);
   }
-  return path.join(global.codecept_dir, fileName);
+  return path.resolve(global.codecept_dir, fileName);
 };
 
 module.exports.beautify = function (code) {

test/unit/utils_test.js

@@ -286,4 +286,32 @@ describe('utils', () => {
       os.platform.restore();
     });
   });
+
+  describe('#screenshotOutputFolder', () => {
+    let _oldGlobalOutputDir;
+    let _oldGlobalCodeceptDir;
+
+    before(() => {
+      _oldGlobalOutputDir = global.output_dir;
+      _oldGlobalCodeceptDir = global.codecept_dir;
+
+      global.output_dir = '/Users/someuser/workbase/project1/test_output';
+      global.codecept_dir = '/Users/someuser/workbase/project1/tests/e2e';
+    });
+
+    after(() => {
+      global.output_dir = _oldGlobalOutputDir;
+      global.codecept_dir = _oldGlobalCodeceptDir;
+    });
+
+    it('returns the joined filename for filename only', () => {
+      const _path = utils.screenshotOutputFolder('screenshot1.failed.png');
+      _path.should.eql('/Users/someuser/workbase/project1/test_output/screenshot1.failed.png');
+    });
+
+    it('returns the given filename for absolute one', () => {
+      const _path = utils.screenshotOutputFolder('/Users/someuser/workbase/project1/test_output/screenshot1.failed.png');
+      _path.should.eql('/Users/someuser/workbase/project1/test_output/screenshot1.failed.png');
+    });
+  });
 });