Fix adb invocations (#202)

This commit is contained in:
Karol Wrótniak
2021-03-10 14:50:33 +01:00
committed by GitHub
parent 50ee38c2ce
commit 5dfdd9ac63
18 changed files with 79 additions and 43 deletions

View File

@@ -1,6 +1,7 @@
var syrup = require('@devicefarmer/stf-syrup')
var browsers = require('@devicefarmer/stf-browser-db')
var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
var logger = require('../../../util/logger')
var wire = require('../../../wire')
@@ -23,6 +24,7 @@ module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('./service'))
.define(function(options, router, push, adb, service) {
var deviceClient = new DeviceClient(adb, options.serial)
var log = logger.createLogger('device:plugins:browser')
function pkg(component) {
@@ -103,7 +105,7 @@ module.exports = syrup.serial()
}
var reply = wireutil.reply(options.serial)
adb.startActivity(options.serial, {
deviceClient.startActivity({
action: 'android.intent.action.VIEW'
, component: message.browser
, data: message.url
@@ -136,7 +138,7 @@ module.exports = syrup.serial()
router.on(wire.BrowserClearMessage, function(channel, message) {
log.info('Clearing "%s"', message.browser)
var reply = wireutil.reply(options.serial)
adb.clear(options.serial, pkg(message.browser))
deviceClient.clear(pkg(message.browser))
.then(function() {
push.send([
channel