Merge 9d6aa33 into 9710fbc

macacajs · Jul 16, 2020 · 88e6446 · 88e6446
2 parents 9710fbc + 9d6aa33
commit 88e6446
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -181,13 +181,13 @@ const extendsMixIn = wd => {
    * @type utility
    * @returns {Promise.<boolean>}
    */
-  wd.addPromiseChainMethod('saveScreenshots', function(context) {
+  wd.addPromiseChainMethod('saveScreenshots', function(context, params) {
     const reporterDir = process.env.MACACA_REPORTER_DIR || cwd;
     const reportspath = path.join(reporterDir, 'reports');
     const filepath = path.join(reportspath, 'screenshots', `${uuid()}.png`);
     mkdir(path.dirname(filepath));
 
-    return this.saveScreenshot(filepath).then(() => {
+    return this.saveScreenshot(filepath, params).then(() => {
       appendToContext(context, `${path.relative(reportspath, filepath)}`);
     });
   });

diff --git a/lib/web/react-router-helper.js b/lib/web/react-router-helper.js
@@ -74,7 +74,7 @@ exports.getRouter = (data, options = {}) => {
           isMatched = matchPath(pathname, currentRoute) || isMatched;
         }
       }, {
-        extname: '.js',
+        extname: '.js'
       });
     });
     currentRoute.path = currentRoute._path || currentRoute.path;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-wd",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Macaca wd client",
   "keywords": [
     "macaca",

diff --git a/wd/lib/commands.js b/wd/lib/commands.js
@@ -1102,10 +1102,12 @@ commands.waitForVisible = function(using, value, timeout, pollFreq) {
  */
 commands.takeScreenshot = function() {
   var cb = findCallback(arguments);
+  var params = arguments[0];
   this._jsonWireCall({
-    method: 'GET'
+    method: 'POST'
     , relPath: '/screenshot'
     , cb: callbackWithData(cb, this)
+    , data: params
   });
 };
 
@@ -1120,6 +1122,7 @@ commands.saveScreenshot = function() {
   var cb = findCallback(arguments);
   var fargs = utils.varargs(arguments);
   var _path = fargs.all[0];
+  var _params = fargs.all[1];
   var dir = process.env.CUSTOM_DIR || '';
 
   function buildFilePath(_path, cb) {
@@ -1141,7 +1144,7 @@ commands.saveScreenshot = function() {
   }
 
   buildFilePath(_path, function(err, filePath) {
-    commands.takeScreenshot.apply(_this, [function(err, base64Data) {
+    commands.takeScreenshot.apply(_this, [_params, function(err, base64Data) {
       if(err) { return cb(err); }
       require("fs").writeFile(filePath, base64Data, 'base64', function(err) {
         if(err) { return cb(err); }