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

chore: don't write into stdout from the test runner, use reporters instead (#11367)

Browse source
This commit is contained in:
Pavel Feldman 2022-01-12 19:52:40 -08:00 committed by GitHub
parent 9285596806
commit feb7148b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 39 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/.eslintrc.js Normal file
View file

@ -0,0 +1,16 @@
module.exports = {
"extends": "../.eslintrc.js",
/**
* ESLint rules
*
* All available rules: http://eslint.org/docs/rules/
*
* Rules take the following form:
* "rule-name", [severity, { opts }]
* Severity: 2 == error, 1 == warning, 0 == off.
*/
"rules": {
"no-console": 2,
"no-debugger": 2
}
};

16
packages/playwright-core/src/.eslintrc.js
View file

@ -1,16 +0,0 @@
module.exports = {
"extends": "../../../.eslintrc.js",
/**
* ESLint rules
*
* All available rules: http://eslint.org/docs/rules/
*
* Rules take the following form:
* "rule-name", [severity, { opts }]
* Severity: 2 == error, 1 == warning, 0 == off.
*/
"rules": {
"no-console": [2, { "allow": ["warn", "error", "assert", "timeStamp", "time", "timeEnd"] }],
"no-debugger": 0
}
};

6
packages/playwright-core/src/client/browserContext.ts
View file

@ -21,14 +21,14 @@ import * as network from './network';
import * as channels from '../protocol/channels';
import fs from 'fs';
import { ChannelOwner } from './channelOwner';
import { deprecate, evaluationScript } from './clientHelper';
import { evaluationScript } from './clientHelper';
import { Browser } from './browser';
import { Worker } from './worker';
import { Events } from './events';
import { TimeoutSettings } from '../utils/timeoutSettings';
import { Waiter } from './waiter';
import { URLMatch, Headers, WaitForEventOptions, BrowserContextOptions, StorageState, LaunchOptions } from './types';
import { isUnderTest, headersObjectToArray, mkdirIfNeeded } from '../utils/utils';
import { headersObjectToArray, mkdirIfNeeded } from '../utils/utils';
import { isSafeCloseError } from '../utils/errors';
import * as api from '../../types/types';
import * as structs from '../../types/structs';
@ -231,8 +231,6 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
}
async setHTTPCredentials(httpCredentials: { username: string, password: string } | null): Promise<void> {
if (!isUnderTest())
deprecate(`context.setHTTPCredentials`, `warning: method |context.setHTTPCredentials()| is deprecated. Instead of changing credentials, create another browser context with new credentials.`);
await this._channel.setHTTPCredentials({ httpCredentials: httpCredentials || undefined });
}

6
packages/playwright-core/src/client/browserType.ts
View file

@ -134,6 +134,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
connection.markAsRemote();
connection.on('close', closePipe);
let closeError: string | undefined;
const onPipeClosed = () => {
// Emulate all pages, contexts and the browser closing upon disconnect.
for (const context of browser?.contexts() || []) {
@ -142,7 +143,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
context._onClose();
}
browser?._didClose();
connection.close(kBrowserClosedError);
connection.close(closeError || kBrowserClosedError);
};
pipe.on('closed', onPipeClosed);
connection.onmessage = message => pipe.send({ message }).catch(onPipeClosed);
@ -151,8 +152,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
try {
connection!.dispatch(message);
} catch (e) {
console.error(`Playwright: Connection dispatch error`);
console.error(e);
closeError = e.toString();
closePipe();
}
});

8
packages/playwright-core/src/client/clientHelper.ts
View file

@ -19,14 +19,6 @@ import * as types from './types';
import fs from 'fs';
import { isString, isRegExp, constructURLBasedOnBaseURL } from '../utils/utils';
const deprecatedHits = new Set();
export function deprecate(methodName: string, message: string) {
if (deprecatedHits.has(methodName))
return;
deprecatedHits.add(methodName);
console.warn(message);
}
export function envObjectToArray(env: types.Env): { name: string, value: string }[] {
const result: { name: string, value: string }[] = [];
for (const name in env) {

1
packages/playwright-core/src/grid/gridServer.ts
View file

@ -307,6 +307,7 @@ export class GridServer {
return { error: undefined };
}).catch(error => {
this._log('failed to launch agent ' + agent.agentId);
// eslint-disable-next-line no-console
console.error(error);
agent.closeAgent(WSErrors.AGENT_CREATION_FAILED);
return { error };

4
packages/playwright-core/src/server/firefox/firefox.ts
View file

@ -58,9 +58,7 @@ export class Firefox extends BrowserType {
}
_defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
const { args = [], devtools, headless } = options;
if (devtools)
console.warn('devtools parameter is not supported as a launch argument in Firefox. You can launch the devtools window manually.');
const { args = [], headless } = options;
const userDataDirArg = args.find(arg => arg.startsWith('-profile') || arg.startsWith('--profile'));
if (userDataDirArg)
throw new Error('Pass userDataDir parameter to `browserType.launchPersistentContext(userDataDir, ...)` instead of specifying --profile argument');

8
packages/playwright-core/src/server/supplements/injected/recorder.ts
View file

@ -58,7 +58,7 @@ export class Recorder {
};
globalThis._playwrightRefreshOverlay();
if (params.isUnderTest)
console.error('Recorder script ready for test');
console.error('Recorder script ready for test'); // eslint-disable-line no-console
}
private _refreshListenersIfNeeded() {
@ -240,7 +240,7 @@ export class Recorder {
const result = activeElement ? generateSelector(this._injectedScript, activeElement) : null;
this._activeModel = result && result.selector ? result : null;
if (this._params.isUnderTest)
console.error('Highlight updated for test: ' + (result ? result.selector : null));
console.error('Highlight updated for test: ' + (result ? result.selector : null)); // eslint-disable-line no-console
}
private _updateModelForHoveredElement() {
@ -256,7 +256,7 @@ export class Recorder {
this._hoveredModel = selector ? { selector, elements } : null;
this._updateHighlight();
if (this._params.isUnderTest)
console.error('Highlight updated for test: ' + selector);
console.error('Highlight updated for test: ' + selector); // eslint-disable-line no-console
}
private _updateHighlight() {
@ -400,7 +400,7 @@ export class Recorder {
if (this._params.isUnderTest) {
// Serialize all to string as we cannot attribute console message to isolated world
// in Firefox.
console.error('Action performed for test: ' + JSON.stringify({
console.error('Action performed for test: ' + JSON.stringify({ // eslint-disable-line no-console
hovered: this._hoveredModel ? this._hoveredModel.selector : null,
active: this._activeModel ? this._activeModel.selector : null,
}));

2
packages/playwright-core/src/server/supplements/recorder/recorderApp.ts
View file

@ -78,7 +78,7 @@ export class RecorderApp extends EventEmitter {
this._page.once('close', () => {
this.emit('close');
this._page.context().close(internalCallMetadata()).catch(e => console.error(e));
this._page.context().close(internalCallMetadata()).catch(() => {});
});
const mainFrame = this._page.mainFrame();

1
packages/playwright-core/src/server/trace/viewer/traceViewer.ts
View file

@ -28,6 +28,7 @@ import { ProgressController } from '../../progress';
export async function showTraceViewer(traceUrl: string, browserName: string, headless = false, port?: number): Promise<BrowserContext | undefined> {
if (traceUrl && !traceUrl.startsWith('http://') && !traceUrl.startsWith('https://') && !fs.existsSync(traceUrl)) {
// eslint-disable-next-line no-console
console.error(`Trace file ${traceUrl} does not exist!`);
process.exit(1);
}

4
packages/playwright-core/src/server/webkit/webkit.ts
View file

@ -46,9 +46,7 @@ export class WebKit extends BrowserType {
}
_defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
const { args = [], proxy, devtools, headless } = options;
if (devtools)
console.warn('devtools parameter as a launch argument in WebKit is not supported. Also starting Web Inspector manually will terminate the execution in WebKit.');
const { args = [], proxy, headless } = options;
const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
if (userDataDirArg)
throw new Error('Pass userDataDir parameter to `browserType.launchPersistentContext(userDataDir, ...)` instead of specifying --user-data-dir argument');

2
packages/playwright-core/src/utils/dependencies.ts
View file

@ -140,7 +140,9 @@ export async function validateDependenciesWindows(windowsExeAndDllDirectories: s
if (isSupportedWindowsVersion()) {
throw new Error(message);
} else {
// eslint-disable-next-line no-console
console.warn(`WARNING: running on unsupported windows version!`);
// eslint-disable-next-line no-console
console.warn(message);
}
}

2
packages/playwright-core/src/utils/httpServer.ts
View file

@ -52,7 +52,7 @@ export class HttpServer {
}
async start(port?: number): Promise<string> {
console.assert(!this._urlPrefix, 'server already started');
assert(!this._urlPrefix, 'server already started');
this._server.on('connection', socket => {
this._activeSockets.add(socket);
socket.once('close', () => this._activeSockets.delete(socket));

1
packages/playwright-core/src/utils/verifyNodeJsVersion.ts
View file

@ -19,6 +19,7 @@ const semver = currentNodeVersion.split('.');
const [major] = [+semver[0]];
if (major < 12) {
// eslint-disable-next-line no-console
console.error(
'You are running Node.js ' +
currentNodeVersion +

1
packages/playwright-core/src/web/traceViewer/sw.ts
View file

@ -73,6 +73,7 @@ async function doFetch(event: FetchEvent): Promise<Response> {
headers: { 'Content-Type': 'application/json' }
});
} catch (error: unknown) {
// eslint-disable-next-line no-console
console.error(error);
const traceFileName = url.searchParams.get('traceFileName')!;
return new Response(JSON.stringify({

2
packages/playwright-test/src/cli.ts
View file

@ -121,7 +121,7 @@ async function runTests(args: string[], opts: { [key: string]: any }) {
process.env.PWDEBUG = '1';
}
const runner = new Runner(overrides, { defaultConfig, printResolvedConfig: process.stdout.isTTY });
const runner = new Runner(overrides, { defaultConfig });
// When no --config option is passed, let's look for the config file in the current directory.
const configFile = opts.config ? path.resolve(process.cwd(), opts.config) : process.cwd();

12
packages/playwright-test/src/runner.ts
View file

@ -54,24 +54,18 @@ type RunOptions = {
export class Runner {
private _loader: Loader;
private _printResolvedConfig: boolean;
private _reporter!: Reporter;
private _didBegin = false;
private _internalGlobalSetups: Array<InternalGlobalSetupFunction> = [];
constructor(configOverrides: Config, options: { defaultConfig?: Config, printResolvedConfig?: boolean } = {}) {
this._printResolvedConfig = !!options.printResolvedConfig;
constructor(configOverrides: Config, options: { defaultConfig?: Config } = {}) {
this._loader = new Loader(options.defaultConfig || {}, configOverrides);
}
async loadConfigFromFile(configFileOrDirectory: string): Promise<Config> {
const loadConfig = async (configFile: string) => {
if (fs.existsSync(configFile)) {
if (this._printResolvedConfig)
console.log(`Using config at ` + configFile);
const config = await this._loader.loadConfigFile(configFile);
return config;
}
if (fs.existsSync(configFile))
return await this._loader.loadConfigFile(configFile);
};
const loadConfigFromDirectory = async (directory: string) => {