Skip to content

Commit

Permalink
chore: use ivya instead of playwright locators directly
Browse files Browse the repository at this point in the history
  • Loading branch information
sheremet-va committed Aug 5, 2024
1 parent 0883b29 commit d698d21
Show file tree
Hide file tree
Showing 23 changed files with 389 additions and 6,428 deletions.
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"@wdio/protocols": "^8.38.0",
"birpc": "0.2.17",
"flatted": "^3.3.1",
"ivya": "^1.1.0",
"pathe": "^1.1.2",
"periscopic": "^4.0.2",
"playwright": "^1.45.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/browser/src/client/tester/context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Task } from 'vitest'
import type { RunnerTask } from 'vitest'
import type { BrowserRPC } from '@vitest/browser/client'
import type {
BrowserPage,
Expand Down Expand Up @@ -46,10 +46,10 @@ function createUserEvent(): UserEvent {
return convertToLocator(element).selectOptions(value)
},
async type(element: Element | Locator, text: string, options: UserEventTypeOptions = {}) {
const css = convertToLocator(element).selector
const selector = convertToSelector(element)
const { unreleased } = await triggerCommand<{ unreleased: string[] }>(
'__vitest_type',
css,
selector,
text,
{ ...options, unreleased: keyboard.unreleased },
)
Expand Down Expand Up @@ -195,6 +195,6 @@ function convertToSelector(elementOrLocator: Element | Locator): string {
throw new Error('Expected element or locator to be an instance of Element or Locator.')
}

function getTaskFullName(task: Task): string {
function getTaskFullName(task: RunnerTask): string {
return task.suite ? `${getTaskFullName(task.suite)} ${task.name}` : task.name
}
42 changes: 31 additions & 11 deletions packages/browser/src/client/tester/locators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,39 @@ import type {
UserEventDragAndDropOptions,
UserEventFillOptions,
} from '@vitest/browser/context'
import { page } from '@vitest/browser/context'
import { page, server } from '@vitest/browser/context'
import type { BrowserRPC } from '@vitest/browser/client'
import {
Ivya,
type ParsedSelector,
asLocator,
getByAltTextSelector,
getByLabelSelector,
getByPlaceholderSelector,
getByRoleSelector,
getByTestIdSelector,
getByTextSelector,
getByTitleSelector,
} from 'ivya'
import type { WorkerGlobalState } from 'vitest'
import type { BrowserRunnerState } from '../../utils'
import { getBrowserState, getWorkerState } from '../../utils'
import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from './playwright-selector/locatorUtils'
import type { ParsedSelector } from './playwright-selector/selectorParser'
import { parseSelector } from './playwright-selector/selectorParser'
import { PlaywrightSelector } from './playwright-selector/selector'
import { asLocator } from './playwright-selector/locatorGenerators'

// we prefer using playwright locators because they are more powerful and support Shdow DOM
export const selectorEngine = new PlaywrightSelector()
// we prefer using playwright locators because they are more powerful and support Shadow DOM
export const selectorEngine = Ivya.create({
browser: ((name: string) => {
switch (name) {
case 'edge':
case 'chrome':
return 'chromium'