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

chore: add CI to default user agent (#15450)

Browse source
This commit is contained in:
Max Schmitt 2022-07-07 21:43:47 +02:00 committed by GitHub
parent b8deb2ba8f
commit 86a65a03e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/playwright-core/src/common/userAgent.ts
View file

@ -57,9 +57,13 @@ function determineUserAgent(): string {
osIdentifier = 'linux'; osIdentifier = 'linux';
} }
} }
const additionalTokens = [];
if (process.env.CI)
additionalTokens.push('CI/1');
const serializedTokens = additionalTokens.length ? ' ' + additionalTokens.join(' ') : '';
const { langName, langVersion } = getClientLanguage(); const { langName, langVersion } = getClientLanguage();
return `Playwright/${getPlaywrightVersion()} (${os.arch()}; ${osIdentifier} ${osVersion}) ${langName}/${langVersion}`; return `Playwright/${getPlaywrightVersion()} (${os.arch()}; ${osIdentifier} ${osVersion}) ${langName}/${langVersion}${serializedTokens}`;
} }
export function getClientLanguage(): { langName: string, langVersion: string } { export function getClientLanguage(): { langName: string, langVersion: string } {

11
tests/library/global-fetch.spec.ts
View file

@ -189,14 +189,19 @@ it('should set playwright as user-agent', async ({ playwright, server, isWindows
.replace(getPlaywrightVersion(), 'X.X.X') .replace(getPlaywrightVersion(), 'X.X.X')
.replace(/\d+/g, 'X'); .replace(/\d+/g, 'X');
const tokens = [];
if (process.env.CI)
tokens.push('CI/X');
const suffix = tokens.length ? ` ${tokens.join(' ')}` : '';
if (isWindows) if (isWindows)
expect(userAgentMasked).toBe('Playwright/X.X.X (<ARCH>; windows X.X) node/X.X'); expect(userAgentMasked).toBe('Playwright/X.X.X (<ARCH>; windows X.X) node/X.X' + suffix);
else if (isLinux) else if (isLinux)
// on ubuntu: distro is 'ubuntu' and version is 'X.X' // on ubuntu: distro is 'ubuntu' and version is 'X.X'
// on manjaro: distro is 'Manjaro' and version is 'unknown' // on manjaro: distro is 'Manjaro' and version is 'unknown'
expect(userAgentMasked.replace(/<ARCH>; \w+ [^)]+/, '<ARCH>; distro version')).toBe('Playwright/X.X.X (<ARCH>; distro version) node/X.X'); expect(userAgentMasked.replace(/<ARCH>; \w+ [^)]+/, '<ARCH>; distro version')).toBe('Playwright/X.X.X (<ARCH>; distro version) node/X.X' + suffix);
else if (isMac) else if (isMac)
expect(userAgentMasked).toBe('Playwright/X.X.X (<ARCH>; macOS X.X) node/X.X'); expect(userAgentMasked).toBe('Playwright/X.X.X (<ARCH>; macOS X.X) node/X.X' + suffix);
}); });
it('should be able to construct with context options', async ({ playwright, browserType, server }) => { it('should be able to construct with context options', async ({ playwright, browserType, server }) => {