Compare commits

...
Author SHA1 Message Date
dpgraham 4c518ddb02 Release 1.11.0-rc.3 2019-01-15 15:15:13 -08:00
dpgraham bd2fd7030b Update appium-espresso-driver 2019-01-15 15:13:57 -08:00
dpgraham 440b27d778 Update appium-uiautomator2-driver 2019-01-15 15:11:48 -08:00
Dan Graham 8edba58fc9 Add deprecation notice when automationName not set (#11979)
* Add deprecation notice when automationName not set

* PR changes
2019-01-15 14:53:21 -08:00
dpgraham df9fa1bac8 Bump version to rc2 2019-01-10 11:25:05 -08:00
dpgraham 474e482d6c Update appium-xcuitest-driver 2019-01-10 11:20:16 -08:00
dpgraham 831ddfd2d6 Release 1.11.0-rc.1 2019-01-09 11:03:27 -08:00
dpgraham abb94791b2 Revert version number 2019-01-09 10:59:49 -08:00
dpgraham 57a0fb6ba7 Do not ignore npm-shrinkwrap.json 2019-01-09 10:58:38 -08:00
dpgraham 4ee1daa1b5 Release 1.11.0-rc.1 2019-01-09 09:39:39 -08:00
dpgraham 24287354b8 Update way outdated dependencies 2019-01-09 09:32:33 -08:00
dpgraham 8b81fbbeb6 Release 1.11.0-rc.0 2019-01-03 11:20:20 -08:00
dpgraham dd0f928ca3 Change version name to make release RC work 2019-01-03 11:20:14 -08:00
dpgraham 55fb6e3c86 Prepare 1.11.0 release candidate 2019-01-03 11:18:33 -08:00
3 changed files with 11557 additions and 30 deletions
+29 -11
View File
@@ -18,16 +18,26 @@ import AsyncLock from 'async-lock';
import { inspectObject, parseCapsForInnerDriver, getPackageVersion } from './utils';
import semver from 'semver';
const PLATFORMS = {
FAKE: 'fake',
ANDROID: 'android',
IOS: 'ios',
WINDOWS: 'windows',
MAC: 'mac',
TIZEN: 'tizen',
};
const AUTOMATION_NAMES = {
APPIUM: 'Appium',
SELENDROID: 'Selendroid',
UIAUTOMATOR2: 'UiAutomator2',
UIAUTOMATOR1: 'UiAutomator1',
XCUITEST: 'XCUITest',
YOUIENGINE: 'YouiEngine',
ESPRESSO: 'Espresso',
TIZEN: 'Tizen',
FAKE: 'Fake',
INSTRUMENTS: 'Instruments',
};
const DRIVER_MAP = {
SelendroidDriver: {
@@ -56,10 +66,12 @@ const DRIVER_MAP = {
},
AndroidDriver: {
driverClass: AndroidDriver,
automationName: AUTOMATION_NAMES.UIAUTOMATOR1,
version: getPackageVersion('appium-android-driver'),
},
IosDriver: {
driverClass: IosDriver,
automationName: AUTOMATION_NAMES.INSTRUMENTS,
version: getPackageVersion('appium-ios-driver'),
},
WindowsDriver: {
@@ -83,20 +95,24 @@ const DRIVER_MAP = {
};
const PLATFORMS_MAP = {
fake: () => FakeDriver,
android: (caps) => {
[PLATFORMS.FAKE]: () => FakeDriver,
[PLATFORMS.ANDROID]: (caps) => {
const platformVersion = semver.valid(semver.coerce(caps.platformVersion));
log.warn(`DeprecationWarning: 'automationName' capability was not provided. ` +
`Future versions of Appium will require 'automationName' capability to be set for Android sessions.`);
log.info(`Setting automation to '${AUTOMATION_NAMES.UIAUTOMATOR1}'. `);
if (platformVersion && semver.satisfies(platformVersion, '>=6.0.0')) {
log.warn("Consider setting 'automationName' capability to " +
`'${AUTOMATION_NAMES.UIAUTOMATOR2}' ` +
"on Android >= 6, since UIAutomator framework " +
"is not maintained anymore by the OS vendor.");
log.warn(`Consider setting 'automationName' capability to '${AUTOMATION_NAMES.UIAUTOMATOR2}' ` +
'on Android >= 6, since UIAutomator1 framework ' +
'is not maintained anymore by the OS vendor.');
}
return AndroidDriver;
},
ios: (caps) => {
[PLATFORMS.IOS]: (caps) => {
const platformVersion = semver.valid(semver.coerce(caps.platformVersion));
log.warn(`DeprecationWarning: 'automationName' capability was not provided. ` +
`Future versions of Appium will require 'automationName' capability to be set for iOS sessions.`);
if (platformVersion && semver.satisfies(platformVersion, '>=10.0.0')) {
log.info("Requested iOS support with version >= 10, " +
`using '${AUTOMATION_NAMES.XCUITEST}' ` +
@@ -107,9 +123,9 @@ const PLATFORMS_MAP = {
return IosDriver;
},
windows: () => WindowsDriver,
mac: () => MacDriver,
tizen: () => TizenDriver,
[PLATFORMS.WINDOWS]: () => WindowsDriver,
[PLATFORMS.MAC]: () => MacDriver,
[PLATFORMS.TIZEN]: () => TizenDriver,
};
const desiredCapabilityConstraints = {
@@ -174,6 +190,8 @@ class AppiumDriver extends BaseDriver {
throw new Error("You must include a platformName capability");
}
const platformName = caps.platformName.toLowerCase();
// we don't necessarily have an `automationName` capability,
if (_.isString(caps.automationName)) {
for (const {automationName, driverClass} of _.values(DRIVER_MAP)) {
@@ -183,7 +201,7 @@ class AppiumDriver extends BaseDriver {
}
}
const driverSelector = PLATFORMS_MAP[caps.platformName.toLowerCase()];
const driverSelector = PLATFORMS_MAP[platformName];
if (driverSelector) {
return driverSelector(caps);
}
+11508
View File
File diff suppressed because it is too large Load Diff
+20 -19
View File
@@ -11,7 +11,7 @@
"firefoxos",
"testing"
],
"version": "1.11.0-beta.3",
"version": "1.11.0-rc.3",
"author": "https://github.com/appium",
"license": "Apache-2.0",
"repository": {
@@ -36,27 +36,28 @@
"files": [
"bin",
"lib",
"build/lib"
"build/lib",
"npm-shrinkwrap.json"
],
"dependencies": {
"@babel/runtime": "^7.0.0",
"appium-android-driver": "^4.0.0",
"appium-base-driver": "3.x",
"appium-espresso-driver": "^1.0.0",
"appium-fake-driver": "^0.x",
"appium-ios-driver": "2.x",
"appium-mac-driver": "1.x",
"appium-selendroid-driver": "1.x",
"appium-support": "2.x",
"appium-android-driver": "^4.8.0",
"appium-base-driver": "^3.13.2",
"appium-espresso-driver": "^1.7.1",
"appium-fake-driver": "^0.6.2",
"appium-ios-driver": "^2.13.2",
"appium-mac-driver": "^1.4.1",
"appium-selendroid-driver": "^1.13.3",
"appium-support": "^2.25.0",
"appium-tizen-driver": "^1.1.1-beta.3",
"appium-uiautomator2-driver": "1.x",
"appium-windows-driver": "1.x",
"appium-xcuitest-driver": "2.x",
"appium-uiautomator2-driver": "^1.27.0",
"appium-windows-driver": "^1.5.1",
"appium-xcuitest-driver": "^2.105.1",
"appium-youiengine-driver": "^1.1.1",
"argparse": "^1.0.10",
"async-lock": "^1.0.0",
"asyncbox": "2.x",
"bluebird": "3.x",
"asyncbox": "^2.5.2",
"bluebird": "^3.5.3",
"continuation-local-storage": "3.x",
"dateformat": "^3.0.3",
"find-root": "^1.1.0",
@@ -65,9 +66,9 @@
"npmlog": "4.x",
"request": "^2.81.0",
"request-promise": "4.x",
"semver": "^5.5.0",
"semver": "^5.6.0",
"source-map-support": "0.x",
"teen_process": "1.x",
"teen_process": "^1.14.1",
"winston": "3.x"
},
"scripts": {
@@ -105,13 +106,13 @@
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-promise": "^4.0.0",
"fancy-log": "^1.3.2",
"fancy-log": "^1.3.3",
"gulp": "^4.0.0",
"handlebars": "^4.0.10",
"mocha": "5.x",
"pre-commit": "1.x",
"replace-ext": "^1.0.0",
"rimraf": "^2.6.2",
"rimraf": "^2.6.3",
"sinon": "^6.0.0",
"validate.js": "^0.12.0",
"wd": "^1.10.0",