Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(android): use isRegExp for a more robust check in different execution contexts (#11359)

Browse source
This commit is contained in:
William Bergeron-Drouin 2022-01-12 14:04:18 -05:00 committed by GitHub
parent 5751a1255b
commit a70f4e6410
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/playwright-core/src/client/android.ts
View file

@ -15,7 +15,7 @@
*/ */
import fs from 'fs'; import fs from 'fs';
import { isString } from '../utils/utils'; import { isString, isRegExp } from '../utils/utils';
import * as channels from '../protocol/channels'; import * as channels from '../protocol/channels';
import { Events } from './events'; import { Events } from './events';
import { BrowserContext, prepareBrowserContextParams } from './browserContext'; import { BrowserContext, prepareBrowserContextParams } from './browserContext';
@ -289,7 +289,7 @@ function toSelectorChannel(selector: api.AndroidSelector): channels.AndroidSelec
const toRegex = (value: RegExp | string | undefined): string | undefined => { const toRegex = (value: RegExp | string | undefined): string | undefined => {
if (value === undefined) if (value === undefined)
return undefined; return undefined;
if (value instanceof RegExp) if (isRegExp(value))
return value.source; return value.source;
return '^' + value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d') + '$'; return '^' + value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d') + '$';
}; };