appium-ios-simulator 3.26.1 → 3.27.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/defaults-utils.js +139 -0
- package/build/lib/geolocation.js +10 -11
- package/build/lib/simulator-xcode-10.js +27 -5
- package/build/lib/simulator-xcode-6.js +5 -32
- package/build/lib/simulator-xcode-9.js +67 -38
- package/lib/defaults-utils.js +154 -0
- package/lib/geolocation.js +17 -10
- package/lib/simulator-xcode-10.js +24 -7
- package/lib/simulator-xcode-6.js +1 -45
- package/lib/simulator-xcode-9.js +73 -35
- package/package.json +4 -4
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.toXmlArg = toXmlArg;
|
|
9
|
+
exports.generateUpdateCommandArgs = generateUpdateCommandArgs;
|
|
10
|
+
exports.NSUserDefaults = void 0;
|
|
11
|
+
|
|
12
|
+
require("source-map-support/register");
|
|
13
|
+
|
|
14
|
+
var _lodash = _interopRequireDefault(require("lodash"));
|
|
15
|
+
|
|
16
|
+
var _xmldom = require("xmldom");
|
|
17
|
+
|
|
18
|
+
var _teen_process = require("teen_process");
|
|
19
|
+
|
|
20
|
+
var _bluebird = _interopRequireDefault(require("bluebird"));
|
|
21
|
+
|
|
22
|
+
var _logger = _interopRequireDefault(require("./logger"));
|
|
23
|
+
|
|
24
|
+
function toXmlArg(value, serialize = true) {
|
|
25
|
+
let xmlDoc = null;
|
|
26
|
+
|
|
27
|
+
if (_lodash.default.isPlainObject(value)) {
|
|
28
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString('<dict></dict>', 'text/xml');
|
|
29
|
+
|
|
30
|
+
for (const [subKey, subValue] of _lodash.default.toPairs(value)) {
|
|
31
|
+
const keyEl = xmlDoc.createElement('key');
|
|
32
|
+
const keyTextEl = xmlDoc.createTextNode(subKey);
|
|
33
|
+
keyEl.appendChild(keyTextEl);
|
|
34
|
+
xmlDoc.documentElement.appendChild(keyEl);
|
|
35
|
+
const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
|
|
36
|
+
xmlDoc.documentElement.appendChild(subValueEl);
|
|
37
|
+
}
|
|
38
|
+
} else if (_lodash.default.isArray(value)) {
|
|
39
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString('<array></array>', 'text/xml');
|
|
40
|
+
|
|
41
|
+
for (const subValue of value) {
|
|
42
|
+
const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
|
|
43
|
+
xmlDoc.documentElement.appendChild(subValueEl);
|
|
44
|
+
}
|
|
45
|
+
} else if (_lodash.default.isBoolean(value)) {
|
|
46
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString(value ? '<true/>' : '<false/>', 'text/xml');
|
|
47
|
+
} else if (_lodash.default.isInteger(value)) {
|
|
48
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString(`<integer>${value}</integer>`, 'text/xml');
|
|
49
|
+
} else if (_lodash.default.isNumber(value)) {
|
|
50
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString(`<real>${value}</real>`, 'text/xml');
|
|
51
|
+
} else if (_lodash.default.isString(value)) {
|
|
52
|
+
xmlDoc = new _xmldom.DOMParser().parseFromString(`<string></string>`, 'text/xml');
|
|
53
|
+
const valueTextEl = xmlDoc.createTextNode(value);
|
|
54
|
+
xmlDoc.documentElement.appendChild(valueTextEl);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (!xmlDoc) {
|
|
58
|
+
throw new TypeError(`The defaults value ${JSON.stringify(value)} cannot be written, ` + `because it is not known how to handle its type`);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return serialize ? new _xmldom.XMLSerializer().serializeToString(xmlDoc.documentElement) : xmlDoc.documentElement;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function generateUpdateCommandArgs(valuesMap) {
|
|
65
|
+
const resultArgs = [];
|
|
66
|
+
|
|
67
|
+
for (const [key, value] of _lodash.default.toPairs(valuesMap)) {
|
|
68
|
+
try {
|
|
69
|
+
if (_lodash.default.isPlainObject(value)) {
|
|
70
|
+
const dictArgs = [key, '-dict-add'];
|
|
71
|
+
|
|
72
|
+
for (const [subKey, subValue] of _lodash.default.toPairs(value)) {
|
|
73
|
+
dictArgs.push(subKey, toXmlArg(subValue));
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
resultArgs.push(dictArgs);
|
|
77
|
+
} else if (_lodash.default.isArray(value)) {
|
|
78
|
+
const arrayArgs = [key, '-array-add'];
|
|
79
|
+
|
|
80
|
+
for (const subValue of arrayArgs) {
|
|
81
|
+
arrayArgs.push(toXmlArg(subValue));
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
resultArgs.push(arrayArgs);
|
|
85
|
+
} else {
|
|
86
|
+
resultArgs.push([key, toXmlArg(value)]);
|
|
87
|
+
}
|
|
88
|
+
} catch (e) {
|
|
89
|
+
if (e instanceof TypeError) {
|
|
90
|
+
_logger.default.warn(e.message);
|
|
91
|
+
} else {
|
|
92
|
+
throw e;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
return resultArgs;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
class NSUserDefaults {
|
|
101
|
+
constructor(plist) {
|
|
102
|
+
this.plist = plist;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
async asJson() {
|
|
106
|
+
try {
|
|
107
|
+
const {
|
|
108
|
+
stdout
|
|
109
|
+
} = await (0, _teen_process.exec)('plutil', ['-convert', 'json', '-o', '-', this.plist]);
|
|
110
|
+
return JSON.parse(stdout);
|
|
111
|
+
} catch (e) {
|
|
112
|
+
throw new Error(`'${this.plist}' cannot be converted to JSON. Original error: ${e.stderr || e.message}`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
async update(valuesMap) {
|
|
117
|
+
if (!_lodash.default.isPlainObject(valuesMap)) {
|
|
118
|
+
throw new TypeError(`plist values must be a map. '${valuesMap}' is given instead`);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (_lodash.default.isEmpty(valuesMap)) {
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
const commandArgs = generateUpdateCommandArgs(valuesMap);
|
|
126
|
+
|
|
127
|
+
try {
|
|
128
|
+
await _bluebird.default.all(commandArgs.map(args => (0, _teen_process.exec)('defaults', ['write', this.plist, ...args])));
|
|
129
|
+
} catch (e) {
|
|
130
|
+
throw new Error(`Could not write defaults into '${this.plist}'. Original error: ${e.stderr || e.message}`);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
exports.NSUserDefaults = NSUserDefaults;require('source-map-support').install();
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/defaults-utils.js"],"names":["toXmlArg","value","serialize","xmlDoc","_","isPlainObject","DOMParser","parseFromString","subKey","subValue","toPairs","keyEl","createElement","keyTextEl","createTextNode","appendChild","documentElement","subValueEl","importNode","isArray","isBoolean","isInteger","isNumber","isString","valueTextEl","TypeError","JSON","stringify","XMLSerializer","serializeToString","generateUpdateCommandArgs","valuesMap","resultArgs","key","dictArgs","push","arrayArgs","e","log","warn","message","NSUserDefaults","constructor","plist","asJson","stdout","parse","Error","stderr","update","isEmpty","commandArgs","B","all","map","args"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { DOMParser, XMLSerializer } from 'xmldom';\nimport { exec } from 'teen_process';\nimport B from 'bluebird';\nimport log from './logger';\n\n/**\n * Serializes the given value to plist-compatible\n * XML representation, which is ready for further usage\n * with `defaults` command line tool arguments\n *\n * @param {*} value The value to be serialized\n * @param {boolean} serialize [true] Whether to serialize the resulting\n * XML to string or to return raw HTMLElement instance\n * @returns {HTMLElement|string} Either string or raw node representation of\n * the given value\n * @throws {TypeError} If it is not known how to serialize the given value\n */\nfunction toXmlArg (value, serialize = true) {\n  let xmlDoc = null;\n\n  if (_.isPlainObject(value)) {\n    xmlDoc = new DOMParser().parseFromString('<dict></dict>', 'text/xml');\n    for (const [subKey, subValue] of _.toPairs(value)) {\n      const keyEl = xmlDoc.createElement('key');\n      const keyTextEl = xmlDoc.createTextNode(subKey);\n      keyEl.appendChild(keyTextEl);\n      xmlDoc.documentElement.appendChild(keyEl);\n      const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);\n      xmlDoc.documentElement.appendChild(subValueEl);\n    }\n  } else if (_.isArray(value)) {\n    xmlDoc = new DOMParser().parseFromString('<array></array>', 'text/xml');\n    for (const subValue of value) {\n      const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);\n      xmlDoc.documentElement.appendChild(subValueEl);\n    }\n  } else if (_.isBoolean(value)) {\n    xmlDoc = new DOMParser().parseFromString(value ? '<true/>' : '<false/>', 'text/xml');\n  } else if (_.isInteger(value)) {\n    xmlDoc = new DOMParser().parseFromString(`<integer>${value}</integer>`, 'text/xml');\n  } else if (_.isNumber(value)) {\n    xmlDoc = new DOMParser().parseFromString(`<real>${value}</real>`, 'text/xml');\n  } else if (_.isString(value)) {\n    xmlDoc = new DOMParser().parseFromString(`<string></string>`, 'text/xml');\n    const valueTextEl = xmlDoc.createTextNode(value);\n    xmlDoc.documentElement.appendChild(valueTextEl);\n  }\n\n  if (!xmlDoc) {\n    throw new TypeError(`The defaults value ${JSON.stringify(value)} cannot be written, ` +\n      `because it is not known how to handle its type`);\n  }\n\n  return serialize\n    ? new XMLSerializer().serializeToString(xmlDoc.documentElement)\n    : xmlDoc.documentElement;\n}\n\n/**\n * Generates command line args for the `defaults`\n * command line utility based on the given preference values mapping.\n * See https://shadowfile.inode.link/blog/2018/06/advanced-defaults1-usage/\n * for more details.\n *\n * @param {Object} valuesMap Preferences mapping\n * @returns {Array<Array<string>>} Each item in the array\n * is the `defaults write <plist>` command suffix\n */\nfunction generateUpdateCommandArgs (valuesMap) {\n  const resultArgs = [];\n  for (const [key, value] of _.toPairs(valuesMap)) {\n    try {\n      if (_.isPlainObject(value)) {\n        const dictArgs = [key, '-dict-add'];\n        for (const [subKey, subValue] of _.toPairs(value)) {\n          dictArgs.push(subKey, toXmlArg(subValue));\n        }\n        resultArgs.push(dictArgs);\n      } else if (_.isArray(value)) {\n        const arrayArgs = [key, '-array-add'];\n        for (const subValue of arrayArgs) {\n          arrayArgs.push(toXmlArg(subValue));\n        }\n        resultArgs.push(arrayArgs);\n      } else {\n        resultArgs.push([key, toXmlArg(value)]);\n      }\n    } catch (e) {\n      if (e instanceof TypeError) {\n        log.warn(e.message);\n      } else {\n        throw e;\n      }\n    }\n  }\n  return resultArgs;\n}\n\n\nclass NSUserDefaults {\n  constructor (plist) {\n    this.plist = plist;\n  }\n\n  /**\n   * Reads the content of the given plist file using plutil command line tool\n   * and serializes it to a JSON representation\n   *\n   * @returns {Object} The serialized plist content\n   * @throws {Error} If there was an error during serialization\n   */\n  async asJson () {\n    try {\n      const {stdout} = await exec('plutil', ['-convert', 'json', '-o', '-', this.plist]);\n      return JSON.parse(stdout);\n    } catch (e) {\n      throw new Error(`'${this.plist}' cannot be converted to JSON. Original error: ${e.stderr || e.message}`);\n    }\n  }\n\n  /**\n   * Updates the content of the given plist file.\n   * If the plist does not exist yet then it is going to be created.\n   *\n   * @param {Object} valuesMap Mapping of preference values to update.\n   * If any of item values are of dictionary type then only the first level dictionary gets\n   * updated. Everything below this level will be replaced. This is the known limitation\n   * of the `defaults` command line tool. A workaround for it would be to read the current\n   * preferences mapping first and merge it with this value.\n   * @throws {Error} If there was an error while updating the plist\n   */\n  async update (valuesMap) {\n    if (!_.isPlainObject(valuesMap)) {\n      throw new TypeError(`plist values must be a map. '${valuesMap}' is given instead`);\n    }\n    if (_.isEmpty(valuesMap)) {\n      return;\n    }\n\n    const commandArgs = generateUpdateCommandArgs(valuesMap);\n    try {\n      await B.all(commandArgs.map((args) => exec('defaults', ['write', this.plist, ...args])));\n    } catch (e) {\n      throw new Error(`Could not write defaults into '${this.plist}'. Original error: ${e.stderr || e.message}`);\n    }\n  }\n}\n\n\nexport {\n  NSUserDefaults,\n  toXmlArg, generateUpdateCommandArgs,\n};\n"],"file":"lib/defaults-utils.js","sourceRoot":"../.."}
|
package/build/lib/geolocation.js
CHANGED
|
@@ -36,21 +36,20 @@ async function setLocationWithLyft(udid, latitude, longitude) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
async function setLocationWithIdb(idb, latitude, longitude) {
|
|
39
|
-
if (idb) {
|
|
40
|
-
|
|
41
|
-
await idb.setLocation(latitude, longitude);
|
|
42
|
-
} catch (e) {
|
|
43
|
-
throw new Error(`Failed to set geolocation with idb. Original error: ${e.stderr || e.message}`);
|
|
44
|
-
}
|
|
39
|
+
if (!idb) {
|
|
40
|
+
throw new Error('Failed to set geolocation with idb because it is not installed or the "launchWithIDB" capability was not set');
|
|
45
41
|
}
|
|
46
42
|
|
|
47
|
-
|
|
43
|
+
try {
|
|
44
|
+
await idb.setLocation(latitude, longitude);
|
|
45
|
+
} catch (e) {
|
|
46
|
+
throw new Error(`Failed to set geolocation with idb. Original error: ${e.stderr || e.message}`);
|
|
47
|
+
}
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
async function setLocationWithAppleScript(sim, latitude, longitude, menu = 'Debug') {
|
|
51
|
-
const decimalSeparator = 0.
|
|
52
|
-
const latitudeStr = `${
|
|
53
|
-
const longitudeStr = `${longitude}`.replace(/\D/g, decimalSeparator);
|
|
51
|
+
const decimalSeparator = (await (0, _teen_process.exec)('/usr/bin/python', ['-c', 'from AppKit import NSNumberFormatter;' + 'import sys;' + 'sys.stdout.write(NSNumberFormatter.alloc().init().decimalSeparator())'])).stdout;
|
|
52
|
+
const [latitudeStr, longitudeStr] = [latitude, longitude].map(coord => `${coord}`.replace(/\D/g, decimalSeparator));
|
|
54
53
|
const output = await sim.executeUIClientScript(`
|
|
55
54
|
tell application "System Events"
|
|
56
55
|
tell process "Simulator"
|
|
@@ -77,4 +76,4 @@ async function setLocationWithAppleScript(sim, latitude, longitude, menu = 'Debu
|
|
|
77
76
|
}require('source-map-support').install();
|
|
78
77
|
|
|
79
78
|
|
|
80
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/geolocation.js"],"names":["LYFT_SET_LOCATION","setLocationWithLyft","udid","latitude","longitude","fs","which","e","Error","stderr","message","setLocationWithIdb","idb","setLocation","setLocationWithAppleScript","sim","menu","decimalSeparator","stdout","latitudeStr","longitudeStr","map","coord","replace","output","executeUIClientScript","log","debug","_","trim"],"mappings":";;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAEA,MAAMA,iBAAiB,GAAG,wBAA1B;;AAYA,eAAeC,mBAAf,CAAoCC,IAApC,EAA0CC,QAA1C,EAAoDC,SAApD,EAA+D;AAC7D,MAAI;AACF,UAAMC,kBAAGC,KAAH,CAASN,iBAAT,CAAN;AACD,GAFD,CAEE,OAAOO,CAAP,EAAU;AACV,UAAM,IAAIC,KAAJ,CAAW,IAAGR,iBAAkB,4CAAtB,GACd,sFADc,GAEd,qFAFc,GAGd,4CAHI,CAAN;AAID;;AAED,MAAI;AACF,UAAM,wBAAKA,iBAAL,EAAwB,CAC5B,IAD4B,EACtBG,QADsB,EACZC,SADY,EAE5B,IAF4B,EAEtBF,IAFsB,CAAxB,CAAN;AAID,GALD,CAKE,OAAOK,CAAP,EAAU;AACV,UAAM,IAAIC,KAAJ,CAAW,mCAAkCR,iBAAkB,KAArD,GACb,mBAAkBO,CAAC,CAACE,MAAF,IAAYF,CAAC,CAACG,OAAQ,EADrC,CAAN;AAED;AACF;;AAYD,eAAeC,kBAAf,CAAmCC,GAAnC,EAAwCT,QAAxC,EAAkDC,SAAlD,EAA6D;AAC3D,MAAI,CAACQ,GAAL,EAAU;AACR,UAAM,IAAIJ,KAAJ,CAAU,8GAAV,CAAN;AACD;;AAED,MAAI;AACF,UAAMI,GAAG,CAACC,WAAJ,CAAgBV,QAAhB,EAA0BC,SAA1B,CAAN;AACD,GAFD,CAEE,OAAOG,CAAP,EAAU;AACV,UAAM,IAAIC,KAAJ,CAAW,uDAAsDD,CAAC,CAACE,MAAF,IAAYF,CAAC,CAACG,OAAQ,EAAvF,CAAN;AACD;AACF;;AAcD,eAAeI,0BAAf,CAA2CC,GAA3C,EAAgDZ,QAAhD,EAA0DC,SAA1D,EAAqEY,IAAI,GAAG,OAA5E,EAAqF;AAEnF,QAAMC,gBAAgB,GAAG,CAAC,MAAM,wBAAK,iBAAL,EAAwB,CACtD,IADsD,EAEtD,0CACA,aADA,GAEA,uEAJsD,CAAxB,CAAP,EAKrBC,MALJ;AAOA,QAAM,CAACC,WAAD,EAAcC,YAAd,IAA8B,CAACjB,QAAD,EAAWC,SAAX,EAAsBiB,GAAtB,CAA2BC,KAAD,IAAY,GAAEA,KAAM,EAAT,CAAWC,OAAX,CAAmB,KAAnB,EAA0BN,gBAA1B,CAArC,CAApC;AAEA,QAAMO,MAAM,GAAG,MAAMT,GAAG,CAACU,qBAAJ,CAA2B;;;;yHAIuET,IAAK;;;8DAGhEG,WAAY;;8DAEZC,YAAa;;;;;;;GATpD,CAArB;;AAiBAM,kBAAIC,KAAJ,CAAW,2CAA0CH,MAAO,EAA5D;;AACA,MAAII,gBAAEC,IAAF,CAAOL,MAAP,MAAmB,MAAvB,EAA+B;AAC7B,UAAM,IAAIhB,KAAJ,CAAW,+DAA8DgB,MAAO,EAAhF,CAAN;AACD;AACF","sourcesContent":["import _ from 'lodash';\nimport log from './logger';\nimport { exec } from 'teen_process';\nimport { fs } from 'appium-support';\n\nconst LYFT_SET_LOCATION = 'set-simulator-location';\n\n/**\n * Set custom geolocation parameters for the given Simulator using LYFT_SET_LOCATION.\n *\n * @param {string} udid - The udid to set the given geolocation\n * @param {string|number} latitude - The latitude value, which is going to be entered\n *   into the corresponding edit field, for example '39,0006'.\n * @param {string|number} longitude - The longitude value, which is going to be entered\n *   into the corresponding edit field, for example '19,0068'.\n * @throws {Error} If it failed to set the location\n */\nasync function setLocationWithLyft (udid, latitude, longitude) {\n  try {\n    await fs.which(LYFT_SET_LOCATION);\n  } catch (e) {\n    throw new Error(`'${LYFT_SET_LOCATION}' binary has not been found in your PATH. ` +\n      'Please install it as \"brew install lyft/formulae/set-simulator-location\" by brew or ' +\n      'read https://github.com/lyft/set-simulator-location to set the binary by manual to ' +\n      'be able to set geolocation by the library.');\n  }\n\n  try {\n    await exec(LYFT_SET_LOCATION, [\n      '-c', latitude, longitude,\n      '-u', udid\n    ]);\n  } catch (e) {\n    throw new Error(`Failed to set geolocation with '${LYFT_SET_LOCATION}'. ` +\n      `Original error: ${e.stderr || e.message}`);\n  }\n}\n\n/**\n * Set custom geolocation parameters for the given Simulator using idb.\n *\n * @param {Object} idb - The IDB instance\n * @param {string|number} latitude - The latitude value, which is going to be entered\n *   into the corresponding edit field, for example '39,0006'.\n * @param {string|number} longitude - The longitude value, which is going to be entered\n *   into the corresponding edit field, for example '19,0068'.\n * @throws {Error} If it failed to set the location\n */\nasync function setLocationWithIdb (idb, latitude, longitude) {\n  if (!idb) {\n    throw new Error('Failed to set geolocation with idb because it is not installed or the \"launchWithIDB\" capability was not set');\n  }\n\n  try {\n    await idb.setLocation(latitude, longitude);\n  } catch (e) {\n    throw new Error(`Failed to set geolocation with idb. Original error: ${e.stderr || e.message}`);\n  }\n}\n\n\n/**\n * Set custom geolocation parameters for the given Simulator using AppleScript\n *\n * @param {Object} sim - The SimulatorXcode object\n * @param {string|number} latitude - The latitude value, which is going to be entered\n *   into the corresponding edit field, for example '39,0006'.\n * @param {string|number} longitude - The longitude value, which is going to be entered\n *   into the corresponding edit field, for example '19,0068'.\n * @param {string} [menu=Debug] - The menu field in which the 'Location' feature is found\n * @throws {Error} If it failed to set the location\n */\nasync function setLocationWithAppleScript (sim, latitude, longitude, menu = 'Debug') {\n  // Make sure system-wide decimal separator is used\n  const decimalSeparator = (await exec('/usr/bin/python', [\n    '-c',\n    'from AppKit import NSNumberFormatter;' +\n    'import sys;' +\n    'sys.stdout.write(NSNumberFormatter.alloc().init().decimalSeparator())'\n  ])).stdout;\n\n  const [latitudeStr, longitudeStr] = [latitude, longitude].map((coord) => `${coord}`.replace(/\\D/g, decimalSeparator));\n\n  const output = await sim.executeUIClientScript(`\n    tell application \"System Events\"\n      tell process \"Simulator\"\n        set featureName to \"Custom Location\"\n        set dstMenuItem to menu item (featureName & \"…\") of menu 1 of menu item \"Location\" of menu 1 of menu bar item \"${menu}\" of menu bar 1\n        click dstMenuItem\n        delay 1\n        set value of text field 1 of window featureName to \"${latitudeStr}\"\n        delay 0.5\n        set value of text field 2 of window featureName to \"${longitudeStr}\"\n        delay 0.5\n        click button \"OK\" of window featureName\n        delay 0.5\n        set isInvisible to (not (exists (window featureName)))\n      end tell\n    end tell\n  `);\n  log.debug(`Geolocation parameters dialog accepted: ${output}`);\n  if (_.trim(output) !== 'true') {\n    throw new Error(`Failed to set geolocation with AppleScript. Original error: ${output}`);\n  }\n}\n\nexport {\n  setLocationWithLyft, setLocationWithIdb, setLocationWithAppleScript\n};\n"],"file":"lib/geolocation.js","sourceRoot":"../.."}
|
|
@@ -50,16 +50,38 @@ class SimulatorXcode10 extends _simulatorXcode.default {
|
|
|
50
50
|
|
|
51
51
|
const timer = new _appiumSupport.timing.Timer().start();
|
|
52
52
|
await this.simctl.openUrl(url);
|
|
53
|
+
let psError;
|
|
53
54
|
|
|
54
55
|
try {
|
|
55
|
-
await (0, _asyncbox.waitForCondition)(async () =>
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
await (0, _asyncbox.waitForCondition)(async () => {
|
|
57
|
+
let procList = [];
|
|
58
|
+
|
|
59
|
+
try {
|
|
60
|
+
procList = await this.ps();
|
|
61
|
+
psError = null;
|
|
62
|
+
} catch (e) {
|
|
63
|
+
_logger.default.debug(e.message);
|
|
64
|
+
|
|
65
|
+
psError = e;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return procList.some(({
|
|
69
|
+
name
|
|
70
|
+
}) => name === _utils.MOBILE_SAFARI_BUNDLE_ID);
|
|
71
|
+
}, {
|
|
58
72
|
waitMs: _utils.SAFARI_STARTUP_TIMEOUT,
|
|
59
73
|
intervalMs: 500
|
|
60
74
|
});
|
|
61
75
|
} catch (err) {
|
|
62
|
-
|
|
76
|
+
const secondsElapsed = timer.getDuration().asSeconds;
|
|
77
|
+
|
|
78
|
+
if (psError) {
|
|
79
|
+
_logger.default.warn(`Mobile Safari process existence cannot be verified after ${secondsElapsed.toFixed(3)}s. ` + `Original error: ${psError.message}`);
|
|
80
|
+
|
|
81
|
+
_logger.default.warn('Continuing anyway');
|
|
82
|
+
} else {
|
|
83
|
+
throw new Error(`Mobile Safari cannot open '${url}' after ${secondsElapsed.toFixed(3)}s. ` + `Its process ${_utils.MOBILE_SAFARI_BUNDLE_ID} does not exist in the list of Simulator processes`);
|
|
84
|
+
}
|
|
63
85
|
}
|
|
64
86
|
|
|
65
87
|
_logger.default.debug(`Safari successfully opened '${url}' in ${timer.getDuration().asSeconds.toFixed(3)}s`);
|
|
@@ -71,4 +93,4 @@ var _default = SimulatorXcode10;
|
|
|
71
93
|
exports.default = _default;require('source-map-support').install();
|
|
72
94
|
|
|
73
95
|
|
|
74
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zaW11bGF0b3IteGNvZGUtMTAuanMiXSwibmFtZXMiOlsiU2ltdWxhdG9yWGNvZGUxMCIsIlNpbXVsYXRvclhjb2RlOTMiLCJjb25zdHJ1Y3RvciIsInVkaWQiLCJ4Y29kZVZlcnNpb24iLCJpc0FwcEluc3RhbGxlZCIsImJ1bmRsZUlkIiwiYXBwQ29udGFpbmVyIiwic2ltY3RsIiwiZ2V0QXBwQ29udGFpbmVyIiwiZW5kc1dpdGgiLCJmcyIsImV4aXN0cyIsImVyciIsImluZm8iLCJhcHBJbmZvIiwiaW5jbHVkZXMiLCJpZ24iLCJvcGVuVXJsIiwidXJsIiwiaXNSdW5uaW5nIiwiRXJyb3IiLCJ0aW1lciIsInRpbWluZyIsIlRpbWVyIiwic3RhcnQiLCJwc0Vycm9yIiwicHJvY0xpc3QiLCJwcyIsImUiLCJsb2ciLCJkZWJ1ZyIsIm1lc3NhZ2UiLCJzb21lIiwibmFtZSIsIk1PQklMRV9TQUZBUklfQlVORExFX0lEIiwid2FpdE1zIiwiU0FGQVJJX1NUQVJUVVBfVElNRU9VVCIsImludGVydmFsTXMiLCJzZWNvbmRzRWxhcHNlZCIsImdldER1cmF0aW9uIiwiYXNTZWNvbmRzIiwid2FybiIsInRvRml4ZWQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBR0EsTUFBTUEsZ0JBQU4sU0FBK0JDLHVCQUEvQixDQUFnRDtBQUM5Q0MsRUFBQUEsV0FBVyxDQUFFQyxJQUFGLEVBQVFDLFlBQVIsRUFBc0I7QUFDL0IsVUFBTUQsSUFBTixFQUFZQyxZQUFaO0FBQ0Q7O0FBU0QsUUFBTUMsY0FBTixDQUFzQkMsUUFBdEIsRUFBZ0M7QUFDOUIsUUFBSTtBQUNGLFlBQU1DLFlBQVksR0FBRyxNQUFNLEtBQUtDLE1BQUwsQ0FBWUMsZUFBWixDQUE0QkgsUUFBNUIsQ0FBM0I7O0FBQ0EsVUFBSSxDQUFDQyxZQUFZLENBQUNHLFFBQWIsQ0FBc0IsTUFBdEIsQ0FBTCxFQUFvQztBQUNsQyxlQUFPLEtBQVA7QUFDRDs7QUFDRCxhQUFPLE1BQU1DLGtCQUFHQyxNQUFILENBQVVMLFlBQVYsQ0FBYjtBQUNELEtBTkQsQ0FNRSxPQUFPTSxHQUFQLEVBQVk7QUFJWixVQUFJO0FBQ0YsY0FBTUMsSUFBSSxHQUFHLE1BQU0sS0FBS04sTUFBTCxDQUFZTyxPQUFaLENBQW9CVCxRQUFwQixDQUFuQjtBQUNBLGVBQU9RLElBQUksQ0FBQ0UsUUFBTCxDQUFjLGlCQUFkLENBQVA7QUFDRCxPQUhELENBR0UsT0FBT0MsR0FBUCxFQUFZLENBQUU7QUFDakI7O0FBQ0QsV0FBTyxLQUFQO0FBQ0Q7O0FBS0QsUUFBTUMsT0FBTixDQUFlQyxHQUFmLEVBQW9CO0FBQ2xCLFFBQUksRUFBQyxNQUFNLEtBQUtDLFNBQUwsRUFBUCxDQUFKLEVBQTZCO0FBQzNCLFlBQU0sSUFBSUMsS0FBSixDQUFXLGtCQUFpQkYsR0FBSSx5Q0FBaEMsQ0FBTjtBQUNEOztBQUNELFVBQU1HLEtBQUssR0FBRyxJQUFJQyxzQkFBT0MsS0FBWCxHQUFtQkMsS0FBbkIsRUFBZDtBQUNBLFVBQU0sS0FBS2pCLE1BQUwsQ0FBWVUsT0FBWixDQUFvQkMsR0FBcEIsQ0FBTjtBQUNBLFFBQUlPLE9BQUo7O0FBQ0EsUUFBSTtBQUNGLFlBQU0sZ0NBQWlCLFlBQVk7QUFDakMsWUFBSUMsUUFBUSxHQUFHLEVBQWY7O0FBQ0EsWUFBSTtBQUNGQSxVQUFBQSxRQUFRLEdBQUcsTUFBTSxLQUFLQyxFQUFMLEVBQWpCO0FBQ0FGLFVBQUFBLE9BQU8sR0FBRyxJQUFWO0FBQ0QsU0FIRCxDQUdFLE9BQU9HLENBQVAsRUFBVTtBQUNWQywwQkFBSUMsS0FBSixDQUFVRixDQUFDLENBQUNHLE9BQVo7O0FBQ0FOLFVBQUFBLE9BQU8sR0FBR0csQ0FBVjtBQUNEOztBQUNELGVBQU9GLFFBQVEsQ0FBQ00sSUFBVCxDQUFjLENBQUM7QUFBQ0MsVUFBQUE7QUFBRCxTQUFELEtBQVlBLElBQUksS0FBS0MsOEJBQW5DLENBQVA7QUFDRCxPQVZLLEVBVUg7QUFDREMsUUFBQUEsTUFBTSxFQUFFQyw2QkFEUDtBQUVEQyxRQUFBQSxVQUFVLEVBQUU7QUFGWCxPQVZHLENBQU47QUFjRCxLQWZELENBZUUsT0FBT3pCLEdBQVAsRUFBWTtBQUNaLFlBQU0wQixjQUFjLEdBQUdqQixLQUFLLENBQUNrQixXQUFOLEdBQW9CQyxTQUEzQzs7QUFDQSxVQUFJZixPQUFKLEVBQWE7QUFDWEksd0JBQUlZLElBQUosQ0FBVSw0REFBMkRILGNBQWMsQ0FBQ0ksT0FBZixDQUF1QixDQUF2QixDQUEwQixLQUF0RixHQUNOLG1CQUFrQmpCLE9BQU8sQ0FBQ00sT0FBUSxFQURyQzs7QUFFQUYsd0JBQUlZLElBQUosQ0FBUyxtQkFBVDtBQUNELE9BSkQsTUFJTztBQUNMLGNBQU0sSUFBSXJCLEtBQUosQ0FBVyw4QkFBNkJGLEdBQUksV0FBVW9CLGNBQWMsQ0FBQ0ksT0FBZixDQUF1QixDQUF2QixDQUEwQixLQUF0RSxHQUNiLGVBQWNSLDhCQUF3QixvREFEbkMsQ0FBTjtBQUVEO0FBQ0Y7O0FBQ0RMLG9CQUFJQyxLQUFKLENBQVcsK0JBQThCWixHQUFJLFFBQU9HLEtBQUssQ0FBQ2tCLFdBQU4sR0FBb0JDLFNBQXBCLENBQThCRSxPQUE5QixDQUFzQyxDQUF0QyxDQUF5QyxHQUE3RjtBQUNEOztBQXBFNkM7O2VBdUVqQzNDLGdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFNpbXVsYXRvclhjb2RlOTMgZnJvbSAnLi9zaW11bGF0b3IteGNvZGUtOS4zJztcbmltcG9ydCB7IGZzLCB0aW1pbmcgfSBmcm9tICdhcHBpdW0tc3VwcG9ydCc7XG5pbXBvcnQgeyB3YWl0Rm9yQ29uZGl0aW9uIH0gZnJvbSAnYXN5bmNib3gnO1xuaW1wb3J0IHsgTU9CSUxFX1NBRkFSSV9CVU5ETEVfSUQsIFNBRkFSSV9TVEFSVFVQX1RJTUVPVVQgfSBmcm9tICcuL3V0aWxzJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuXG5cbmNsYXNzIFNpbXVsYXRvclhjb2RlMTAgZXh0ZW5kcyBTaW11bGF0b3JYY29kZTkzIHtcbiAgY29uc3RydWN0b3IgKHVkaWQsIHhjb2RlVmVyc2lvbikge1xuICAgIHN1cGVyKHVkaWQsIHhjb2RlVmVyc2lvbik7XG4gIH1cblxuICAvKipcbiAgICogVmVyaWZ5IHdoZXRoZXIgdGhlIHBhcnRpY3VsYXIgYXBwbGljYXRpb24gaXMgaW5zdGFsbGVkIG9uIFNpbXVsYXRvci5cbiAgICogQG92ZXJyaWRlXG4gICAqXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBidW5kbGVJZCAtIFRoZSBidW5kbGUgaWQgb2YgdGhlIGFwcGxpY2F0aW9uIHRvIGJlIGNoZWNrZWQuXG4gICAqIEByZXR1cm4ge2Jvb2xlYW59IFRydWUgaWYgdGhlIGdpdmVuIGFwcGxpY2F0aW9uIGlzIGluc3RhbGxlZC5cbiAgICovXG4gIGFzeW5jIGlzQXBwSW5zdGFsbGVkIChidW5kbGVJZCkge1xuICAgIHRyeSB7XG4gICAgICBjb25zdCBhcHBDb250YWluZXIgPSBhd2FpdCB0aGlzLnNpbWN0bC5nZXRBcHBDb250YWluZXIoYnVuZGxlSWQpO1xuICAgICAgaWYgKCFhcHBDb250YWluZXIuZW5kc1dpdGgoJy5hcHAnKSkge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgICByZXR1cm4gYXdhaXQgZnMuZXhpc3RzKGFwcENvbnRhaW5lcik7XG4gICAgfSBjYXRjaCAoZXJyKSB7XG4gICAgICAvLyBnZXRfYXBwX2NvbnRhaW5lciBzdWJjb21tYW5kIGZhaWxzIGZvciBzeXN0ZW0gYXBwbGljYXRpb25zLFxuICAgICAgLy8gc28gd2UgdHJ5IHRoZSBoaWRkZW4gYXBwaW5mbyBzdWJjb21tYW5kLCB3aGljaCBwcmludHMgY29ycmVjdCBpbmZvIGZvclxuICAgICAgLy8gc3lzdGVtL2hpZGRlbiBhcHBzXG4gICAgICB0cnkge1xuICAgICAgICBjb25zdCBpbmZvID0gYXdhaXQgdGhpcy5zaW1jdGwuYXBwSW5mbyhidW5kbGVJZCk7XG4gICAgICAgIHJldHVybiBpbmZvLmluY2x1ZGVzKCdBcHBsaWNhdGlvblR5cGUnKTtcbiAgICAgIH0gY2F0Y2ggKGlnbikge31cbiAgICB9XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG5cbiAgLyoqXG4gICAqIEBvdmVycmlkZVxuICAgKi9cbiAgYXN5bmMgb3BlblVybCAodXJsKSB7XG4gICAgaWYgKCFhd2FpdCB0aGlzLmlzUnVubmluZygpKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoYFRyaWVkIHRvIG9wZW4gJyR7dXJsfScsIGJ1dCBTaW11bGF0b3IgaXMgbm90IGluIEJvb3RlZCBzdGF0ZWApO1xuICAgIH1cbiAgICBjb25zdCB0aW1lciA9IG5ldyB0aW1pbmcuVGltZXIoKS5zdGFydCgpO1xuICAgIGF3YWl0IHRoaXMuc2ltY3RsLm9wZW5VcmwodXJsKTtcbiAgICBsZXQgcHNFcnJvcjtcbiAgICB0cnkge1xuICAgICAgYXdhaXQgd2FpdEZvckNvbmRpdGlvbihhc3luYyAoKSA9PiB7XG4gICAgICAgIGxldCBwcm9jTGlzdCA9IFtdO1xuICAgICAgICB0cnkge1xuICAgICAgICAgIHByb2NMaXN0ID0gYXdhaXQgdGhpcy5wcygpO1xuICAgICAgICAgIHBzRXJyb3IgPSBudWxsO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgbG9nLmRlYnVnKGUubWVzc2FnZSk7XG4gICAgICAgICAgcHNFcnJvciA9IGU7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHByb2NMaXN0LnNvbWUoKHtuYW1lfSkgPT4gbmFtZSA9PT0gTU9CSUxFX1NBRkFSSV9CVU5ETEVfSUQpO1xuICAgICAgfSwge1xuICAgICAgICB3YWl0TXM6IFNBRkFSSV9TVEFSVFVQX1RJTUVPVVQsXG4gICAgICAgIGludGVydmFsTXM6IDUwMCxcbiAgICAgIH0pO1xuICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgY29uc3Qgc2Vjb25kc0VsYXBzZWQgPSB0aW1lci5nZXREdXJhdGlvbigpLmFzU2Vjb25kcztcbiAgICAgIGlmIChwc0Vycm9yKSB7XG4gICAgICAgIGxvZy53YXJuKGBNb2JpbGUgU2FmYXJpIHByb2Nlc3MgZXhpc3RlbmNlIGNhbm5vdCBiZSB2ZXJpZmllZCBhZnRlciAke3NlY29uZHNFbGFwc2VkLnRvRml4ZWQoMyl9cy4gYCArXG4gICAgICAgICAgYE9yaWdpbmFsIGVycm9yOiAke3BzRXJyb3IubWVzc2FnZX1gKTtcbiAgICAgICAgbG9nLndhcm4oJ0NvbnRpbnVpbmcgYW55d2F5Jyk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYE1vYmlsZSBTYWZhcmkgY2Fubm90IG9wZW4gJyR7dXJsfScgYWZ0ZXIgJHtzZWNvbmRzRWxhcHNlZC50b0ZpeGVkKDMpfXMuIGAgK1xuICAgICAgICAgIGBJdHMgcHJvY2VzcyAke01PQklMRV9TQUZBUklfQlVORExFX0lEfSBkb2VzIG5vdCBleGlzdCBpbiB0aGUgbGlzdCBvZiBTaW11bGF0b3IgcHJvY2Vzc2VzYCk7XG4gICAgICB9XG4gICAgfVxuICAgIGxvZy5kZWJ1ZyhgU2FmYXJpIHN1Y2Nlc3NmdWxseSBvcGVuZWQgJyR7dXJsfScgaW4gJHt0aW1lci5nZXREdXJhdGlvbigpLmFzU2Vjb25kcy50b0ZpeGVkKDMpfXNgKTtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBTaW11bGF0b3JYY29kZTEwO1xuIl0sImZpbGUiOiJsaWIvc2ltdWxhdG9yLXhjb2RlLTEwLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
|