mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-05-12 22:08:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

addingn linting to adb.js and fixing some lint issues

Browse Source
This commit is contained in:
Jonathan Lipps
2013-04-08 17:54:44 -07:00
parent cc9c6aadd6
commit 15d8affc2e
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+1 -1
View File
@@ -19,7 +19,7 @@ var path = require('path')
module.exports = function(grunt) {
grunt.initConfig({
jshint: {
all: ['*.js', 'app/*.js', 'app/test/unit/*.js', 'instruments/*.js', 'test/functional/*.js', 'test/unit/*.js', 'test/functional/appium/*.js', 'test/functional/testapp/*.js', 'test/functional/uicatalog/*.js', 'test/functional/webview/*.js', 'test/helpers/*.js', 'test/functional/safari/*.js', 'test/functional/prefs/*.js', 'app/uiauto/appium/app.js', 'app/uiauto/appium/binding.js', 'app/uiauto/element.js', 'app/uiauto/appium/utility.js', 'app/uiauto/lib/instruments_client.js', 'app/uiauto/lib/status.js']
all: ['*.js', 'app/*.js', 'app/test/unit/*.js', 'instruments/*.js', 'test/functional/*.js', 'test/unit/*.js', 'test/functional/appium/*.js', 'test/functional/testapp/*.js', 'test/functional/uicatalog/*.js', 'test/functional/webview/*.js', 'test/helpers/*.js', 'test/functional/safari/*.js', 'test/functional/prefs/*.js', 'app/uiauto/appium/app.js', 'app/uiauto/appium/binding.js', 'app/uiauto/element.js', 'app/uiauto/appium/utility.js', 'app/uiauto/lib/instruments_client.js', 'app/uiauto/lib/status.js', 'uiautomator/*.js']
, options: {
laxcomma: true
, es5: true
uiautomator/adb.js
+20 -11
View File
@@ -165,14 +165,13 @@ ADB.prototype.compileManifest = function(cb, manifest) {
},
],
// Invoke top level function cb
function(){ cb(null) });
function(){ cb(null); });
};
ADB.prototype.insertManifest = function(manifest, skipAppSign, cb) {
var me = this;
var targetAPK = me.apkPath;
var cleanAPK = me.cleanAPK;
var utf8 = 'utf8';
async.series(
[
// Extract compiled manifest from manifest.xml.apk
@@ -191,22 +190,27 @@ ADB.prototype.insertManifest = function(manifest, skipAppSign, cb) {
logger.debug("Writing tmp apk. " + cleanAPKSource + ' to ' + cleanAPK);
// Write clean apk to /tmp
ncp(cleanAPKSource, cleanAPK, function(err) { if (err) return cb(err); cb(null) });
ncp(cleanAPKSource, cleanAPK, function(err) {
if (err) return cb(err);
cb(null);
});
},
function(cb) {
logger.debug("Testing tmp clean apk.");
testZipArchive(cleanAPK, function(err) { if (err) return cb(err); cb(null) });
testZipArchive(cleanAPK, function(err) {
if (err) return cb(err);
cb(null);
});
},
function(cb) {
// -j = keep only the file, not the dirs
// -m = move manifest into target apk.
var replaceCmd = 'zip -j -m "' + cleanAPK + '" "' + manifest + '"';
logger.debug(replaceCmd);
exec(replaceCmd, {}, function(err, stderr, stdout) {
exec(replaceCmd, {}, function(err) {
if (err) {
return cb(err);
}
logger.debug("Inserted manifest.");
cb(null);
});
@@ -218,11 +222,14 @@ ADB.prototype.insertManifest = function(manifest, skipAppSign, cb) {
logger.debug("Skip app sign.");
apks.push(targetAPK);
}
me.sign(function(err) { if (err) return cb(err); cb(null) }, apks);
me.sign(function(err) {
if (err) return cb(err);
cb(null);
}, apks);
}
],
// Invoke top level function cb
function(){ cb(null) });
function(){ cb(null); });
};
// apks is an array of strings.
@@ -247,7 +254,7 @@ ADB.prototype.checkAppCert = function(cb) {
var verifyPath = path.resolve(__dirname, '../app/android/verify.jar');
var resign = 'java -jar "' + verifyPath + '" "' + this.apkPath + '"';
logger.debug("Checking app cert: " + resign);
exec(resign, {}, function(err, stderr, stdout) {
exec(resign, {}, function(err) {
if (err) {
logger.debug("App not signed with debug cert.");
return cb(false);
@@ -786,13 +793,15 @@ ADB.prototype.uninstallApp = function(cb) {
me.requireDeviceId();
me.requireApp();
me.debug("Uninstalling app " + me.appPackage);
var cmd = me.adbCmd + " uninstall " + me.appPackage;
me.uninstallApk(me.appPackage, function(err) {
if (me.fastReset) {
var cleanPkg = me.appPackage + '.clean';
me.debug("Uninstalling app " + cleanPkg);
me.uninstallApk(cleanPkg, function(err) {if (err) return cb(err); cb(null)});
me.uninstallApk(cleanPkg, function(err) {
if (err) return cb(err);
cb(null);
});
} else {
if (err) return cb(err);
cb(null);