Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mobile app testing with test_workers enabled. #3559

Merged
merged 1 commit into from Jan 9, 2023
Merged

Fix mobile app testing with test_workers enabled. #3559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/core/client.js
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ const Transport = require('../transport');
const Element = require('../element');
const ApiLoader = require('../api');
const ElementGlobal = require('../api/_loaders/element-global.js');
const {isAndroid, isIos} = require('../utils/mobile');

const {LocateStrategy, Locator} = Element;
const {Logger, isUndefined, isDefined, isObject, isFunction} = Utils;
Expand Down Expand Up @@ -37,7 +38,7 @@ class NightwatchAPI {
}

if (this.desiredCapabilities instanceof Capabilities) {
return this.desiredCapabilities.getplatformName();
return this.desiredCapabilities.getPlatform();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no method named getplatformName in Capabilities so this would have always thrown error earlier. Correct method name is getPlaform.

}

return this.desiredCapabilities.platformName;
Expand Down Expand Up @@ -79,11 +80,11 @@ class NightwatchAPI {
}

isIOS() {
return this.__isPlatformName('iOS');
return isIos(this.desiredCapabilities);
}

isAndroid() {
return this.__isPlatformName('Android');
return isAndroid(this.desiredCapabilities);
}

isMobile() {
Expand Down
14 changes: 10 additions & 4 deletions lib/utils/mobile.js
View file
Open in desktop
Expand Up @@ -29,7 +29,13 @@ function requireMobileHelper() {
* @param {Object} desiredCapabilities
* @returns {Boolean}
*/
function isAndroid(desiredCapabilities){
function isAndroid(desiredCapabilities = {}){
const {platformName} = desiredCapabilities;

if (platformName && platformName.toLowerCase() === 'android') {
return true;
}

const options = desiredCapabilities['goog:chromeOptions'] || desiredCapabilities['moz:firefoxOptions'];

if (options && options.androidPackage) {
Expand All @@ -44,10 +50,10 @@ function isAndroid(desiredCapabilities){
* @param {Object} desiredCapabilities
* @returns {Boolean}
*/
function isIos(desiredCapabilities) {
const {browserName = '', platformName = ''} = desiredCapabilities;
function isIos(desiredCapabilities = {}) {
const {platformName} = desiredCapabilities;

if (browserName.toLowerCase() === 'safari' && platformName.toLowerCase() === 'ios') {
if (platformName && platformName.toLowerCase() === 'ios') {
return true;
}

Expand Down
8 changes: 4 additions & 4 deletions test/src/index/transport/testMobileOptions.js
View file
Open in desktop
Expand Up @@ -36,9 +36,9 @@ describe('Test mobile options in Nightwatch/Appium client', function () {
desiredCapabilities: {
browserName: 'Chrome',
javascriptEnabled: true,
platformName: 'Android',
platformVersion: '13.0',
deviceName: 'Google Pixel'
'goog:chromeOptions': {
androidPackage: 'com.android.chrome'
}
}
});

Expand Down Expand Up @@ -94,7 +94,7 @@ describe('Test mobile options in Nightwatch/Appium client', function () {
use_appium: true
},
desiredCapabilities: {
browserName: '',
browserName: null,
platformName: 'Android'
}
});
Expand Down