yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 02:29:26 +02:00
Code Issues Releases Wiki Activity

Rename identity.browsers to identity.browser.

Browse source
This commit is contained in:
Simo Kinnunen 2014-04-22 10:31:53 +09:00
parent 9375fd7fe6
commit 0dfc502e80
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/db/api.js
View file

@ -134,7 +134,7 @@ dbapi.saveDeviceIdentity = function(serial, identity) {
, abi: identity.abi , abi: identity.abi
, sdk: identity.sdk , sdk: identity.sdk
, display: identity.display , display: identity.display
, browsers: identity.browsers , browser: identity.browser
, phone: identity.phone , phone: identity.phone
})) }))
} }

0
lib/roles/device/plugins/browsers.js → lib/roles/device/plugins/browser.js
View file

6
lib/roles/device/plugins/identity.js
View file

@ -6,16 +6,16 @@ var logger = require('../../../util/logger')
module.exports = syrup.serial() module.exports = syrup.serial()
.dependency(require('../support/properties')) .dependency(require('../support/properties'))
.dependency(require('./display')) .dependency(require('./display'))
.dependency(require('./browsers')) .dependency(require('./browser'))
.dependency(require('./phone')) .dependency(require('./phone'))
.define(function(options, properties, display, browsers, phone) { .define(function(options, properties, display, browser, phone) {
var log = logger.createLogger('device:plugins:identity') var log = logger.createLogger('device:plugins:identity')
function solve() { function solve() {
log.info('Solving identity') log.info('Solving identity')
var identity = devutil.makeIdentity(options.serial, properties) var identity = devutil.makeIdentity(options.serial, properties)
identity.display = display identity.display = display
identity.browsers = browsers identity.browser = browser
identity.phone = phone identity.phone = phone
return identity return identity
} }

6
lib/roles/device/plugins/solo.js
View file

@ -42,9 +42,9 @@ module.exports = syrup.serial()
, identity.display.secure , identity.display.secure
, identity.display.url , identity.display.url
) )
, new wire.DeviceBrowsersMessage( , new wire.DeviceBrowserMessage(
identity.browsers.selected identity.browser.selected
, identity.browsers.apps.map(function(app) { , identity.browser.apps.map(function(app) {
return new wire.DeviceBrowserAppMessage( return new wire.DeviceBrowserAppMessage(
app.id app.id
, app.type , app.type

4
lib/wire/wire.proto
View file

@ -143,7 +143,7 @@ message DeviceBrowserAppMessage {
required bool selected = 4; required bool selected = 4;
} }
message DeviceBrowsersMessage { message DeviceBrowserMessage {
required bool selected = 1; required bool selected = 1;
repeated DeviceBrowserAppMessage apps = 2; repeated DeviceBrowserAppMessage apps = 2;
} }
@ -165,7 +165,7 @@ message DeviceIdentityMessage {
required string abi = 7; required string abi = 7;
required string sdk = 8; required string sdk = 8;
required DeviceDisplayMessage display = 9; required DeviceDisplayMessage display = 9;
required DeviceBrowsersMessage browsers = 10; required DeviceBrowserMessage browser = 10;
required DevicePhoneMessage phone = 11; required DevicePhoneMessage phone = 11;
} }