cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alsoro...@apache.org
Subject cordova-paramedic git commit: CB-11557 Fixed app upload to Sauce Labs before Appium test run
Date Tue, 12 Jul 2016 10:42:02 GMT
Repository: cordova-paramedic
Updated Branches:
  refs/heads/master a8ed6943c -> 492025ead


CB-11557 Fixed app upload to Sauce Labs before Appium test run


Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/492025ea
Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/492025ea
Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/492025ea

Branch: refs/heads/master
Commit: 492025eada668aec25c8797220eef190ded78495
Parents: a8ed694
Author: Alexander Sorokin <alexander.sorokin@akvelon.com>
Authored: Tue Jul 12 13:41:15 2016 +0300
Committer: Alexander Sorokin <alexander.sorokin@akvelon.com>
Committed: Tue Jul 12 13:41:15 2016 +0300

----------------------------------------------------------------------
 lib/appium/helpers/wdHelper.js | 6 +++---
 lib/paramedic.js               | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/492025ea/lib/appium/helpers/wdHelper.js
----------------------------------------------------------------------
diff --git a/lib/appium/helpers/wdHelper.js b/lib/appium/helpers/wdHelper.js
index 61505d5..370352b 100644
--- a/lib/appium/helpers/wdHelper.js
+++ b/lib/appium/helpers/wdHelper.js
@@ -224,7 +224,7 @@ module.exports.addFillerImage = function (driver) {
     var base64str = new Buffer(bitmap).toString('base64');
 
     return driver.executeAsync(function (b64str, cb) {
-        if (window.imageSaver) {
+        try {
             window.imageSaver.saveBase64Image( {
                 data: b64str
             }, function (fpath) {
@@ -232,8 +232,8 @@ module.exports.addFillerImage = function (driver) {
             }, function (err) {
                 cb('ERROR: ' + err);
             });
-        } else {
-            cb();
+        } catch(err) {
+            cb('ERROR: ' + err.message);
         }
     }, [base64str]);
 };

http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/492025ea/lib/paramedic.js
----------------------------------------------------------------------
diff --git a/lib/paramedic.js b/lib/paramedic.js
index ee1a084..5e30914 100644
--- a/lib/paramedic.js
+++ b/lib/paramedic.js
@@ -251,7 +251,7 @@ ParamedicRunner.prototype.runAppiumTests = function (useSauce) {
         throw new Error('Cannot determine device name for Appium');
     }
 
-    logger.normal('Running Appium tests ' + useSauce ? 'on Sauce Labs' : 'locally');
+    logger.normal('Running Appium tests ' + (useSauce ? 'on Sauce Labs' : 'locally'));
 
     var options = {
         platform: self.config.getPlatformId(),
@@ -282,7 +282,8 @@ ParamedicRunner.prototype.runAppiumTests = function (useSauce) {
     })
     .then(function () {
         if (useSauce) {
-            return self.uploadApp.bind(self);
+            return self.packageApp()
+            .then(self.uploadApp.bind(self));
         }
     })
     .then(function () {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message