Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/locators/locator-generation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ export function getSuggestedLocators(
let priorityOrder: string[];

if (isNative && (automationName === 'xcuitest' || automationName === 'mac2')) {
// iOS priority: Accessibility Id > Predicate > Class Chain > XPath > Class Name
priorityOrder = ['id', 'accessibility id', '-ios predicate string', '-ios class chain', 'xpath', 'class name'];
// iOS priority: Accessibility Id > Id > Predicate > Class Chain > XPath > Class Name
priorityOrder = ['accessibility id', 'id', '-ios predicate string', '-ios class chain', 'xpath', 'class name'];
} else if (isNative && automationName === 'uiautomator2') {
// Android priority: Accessibility Id > UiAutomator > XPath > Class Name
priorityOrder = ['id', 'accessibility id', 'xpath', '-android uiautomator', 'class name'];
// Android priority: Accessibility Id > Id > XPath > UiAutomator > Class Name
priorityOrder = ['accessibility id', 'id', 'xpath', '-android uiautomator', 'class name'];
} else {
priorityOrder = ['id', 'class name', 'xpath'];
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/interactions/handle-alert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {getPlatformName, PLATFORM} from '../../session-store.js';
import type {DriverInstance} from '../../session-store.js';
import {resolveDriver, textResult, errorResult, toolErrorMessage} from '../tool-response.js';

const ANDROID_LOCATOR_STRATEGY_ORDER = ['id', 'accessibility id', 'xpath', '-android uiautomator', 'class name'];
const ANDROID_LOCATOR_STRATEGY_ORDER = ['accessibility id', 'id', 'xpath', '-android uiautomator', 'class name'];

export default function alert(server: FastMCP): void {
const appiumAlertSchema = z.object({
Expand Down