Skip to content

Commit

Permalink
Revert "feat: add defaultTimeout browser context configuration option (
Browse files Browse the repository at this point in the history
…microsoft#6944)" (microsoft#7057)

This reverts commit 617dfde.

It turns out this might conflict with our bright testrunner future.
  • Loading branch information
aslushnikov authored Jun 11, 2021
1 parent 617dfde commit f52290d
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 51 deletions.
6 changes: 0 additions & 6 deletions docs/src/api/params.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,6 @@ contexts override the proxy, global proxy will be never used and can be any stri
`launch({ proxy: { server: 'http://per-context' } })`.
:::

## context-option-defaulttimeout
- `defaultTimeout` <[float]>

Set the default browser context timeout for the new context. Equivalent to calling [`method: BrowserContext.setDefaultTimeout`].

## select-options-values
* langs: java, js, csharp
- `values` <[null]|[string]|[ElementHandle]|[Array]<[string]>|[Object]|[Array]<[ElementHandle]>|[Array]<[Object]>>
Expand Down Expand Up @@ -599,7 +594,6 @@ using the [`method: AndroidDevice.setDefaultTimeout`] method.
- %%-context-option-recordvideo-%%
- %%-context-option-recordvideo-dir-%%
- %%-context-option-recordvideo-size-%%
- %%-context-option-defaulttimeout-%%

## browser-option-args
- `args` <[Array]<[string]>>
Expand Down
4 changes: 0 additions & 4 deletions src/protocol/channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ export type BrowserTypeLaunchPersistentContextParams = {
omitContent?: boolean,
path: string,
},
defaultTimeout?: number,
userDataDir: string,
slowMo?: number,
};
Expand Down Expand Up @@ -410,7 +409,6 @@ export type BrowserTypeLaunchPersistentContextOptions = {
omitContent?: boolean,
path: string,
},
defaultTimeout?: number,
slowMo?: number,
};
export type BrowserTypeLaunchPersistentContextResult = {
Expand Down Expand Up @@ -501,7 +499,6 @@ export type BrowserNewContextParams = {
omitContent?: boolean,
path: string,
},
defaultTimeout?: number,
proxy?: {
server: string,
bypass?: string,
Expand Down Expand Up @@ -559,7 +556,6 @@ export type BrowserNewContextOptions = {
omitContent?: boolean,
path: string,
},
defaultTimeout?: number,
proxy?: {
server: string,
bypass?: string,
Expand Down
1 change: 0 additions & 1 deletion src/protocol/protocol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ ContextOptions:
properties:
omitContent: boolean?
path: string
defaultTimeout: number?


Playwright:
Expand Down
2 changes: 0 additions & 2 deletions src/protocol/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ export function createScheme(tChannel: (name: string) => Validator): Scheme {
omitContent: tOptional(tBoolean),
path: tString,
})),
defaultTimeout: tOptional(tNumber),
userDataDir: tString,
slowMo: tOptional(tNumber),
});
Expand Down Expand Up @@ -308,7 +307,6 @@ export function createScheme(tChannel: (name: string) => Validator): Scheme {
omitContent: tOptional(tBoolean),
path: tString,
})),
defaultTimeout: tOptional(tNumber),
proxy: tOptional(tObject({
server: tString,
bypass: tOptional(tString),
Expand Down
3 changes: 0 additions & 3 deletions src/server/browserContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ export abstract class BrowserContext extends SdkObject {
if (this._options.recordHar)
this._harTracer = new HarTracer(this, this._options.recordHar);
this.tracing = new Tracing(this);

if (typeof this._options.defaultTimeout === 'number' && !debugMode())
this._timeoutSettings.setDefaultTimeout(this._options.defaultTimeout);
}

_setSelectors(selectors: Selectors) {
Expand Down
1 change: 0 additions & 1 deletion src/server/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ export type BrowserContextOptions = {
},
proxy?: ProxySettings,
_debugName?: string,
defaultTimeout?: number,
};

export type EnvArray = { name: string, value: string }[];
Expand Down
10 changes: 0 additions & 10 deletions tests/browsercontext-basic.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,6 @@ it('should be able to navigate after disabling javascript', async ({browser, ser
await context.close();
});

it('should respect default timeout when configured', async ({browser, playwright}) => {
const context = await browser.newContext({ defaultTimeout: 5 });
const page = await context.newPage();
let error = null;
await page.waitForFunction('false').catch(e => error = e);
expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
expect(error.message).toContain('page.waitForFunction: Timeout 5ms exceeded');
await context.close();
});

it('should work with offline option', async ({browser, server}) => {
const context = await browser.newContext({offline: true});
const page = await context.newPage();
Expand Down
24 changes: 0 additions & 24 deletions types/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6985,12 +6985,6 @@ export interface BrowserType<Unused = {}> {
*/
colorScheme?: "light"|"dark"|"no-preference";

/**
* Set the default browser context timeout for the new context. Equivalent to calling
* [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browsercontextsetdefaulttimeouttimeout).
*/
defaultTimeout?: number;

/**
* Specify device scale factor (can be thought of as dpr). Defaults to `1`.
*/
Expand Down Expand Up @@ -8102,12 +8096,6 @@ export interface AndroidDevice {
*/
command?: string;

/**
* Set the default browser context timeout for the new context. Equivalent to calling
* [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browsercontextsetdefaulttimeouttimeout).
*/
defaultTimeout?: number;

/**
* Specify device scale factor (can be thought of as dpr). Defaults to `1`.
*/
Expand Down Expand Up @@ -8862,12 +8850,6 @@ export interface Browser extends EventEmitter {
*/
colorScheme?: "light"|"dark"|"no-preference";

/**
* Set the default browser context timeout for the new context. Equivalent to calling
* [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browsercontextsetdefaulttimeouttimeout).
*/
defaultTimeout?: number;

/**
* Specify device scale factor (can be thought of as dpr). Defaults to `1`.
*/
Expand Down Expand Up @@ -10937,12 +10919,6 @@ export interface BrowserContextOptions {
*/
colorScheme?: "light"|"dark"|"no-preference";

/**
* Set the default browser context timeout for the new context. Equivalent to calling
* [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browsercontextsetdefaulttimeouttimeout).
*/
defaultTimeout?: number;

/**
* Specify device scale factor (can be thought of as dpr). Defaults to `1`.
*/
Expand Down

0 comments on commit f52290d

Please sign in to comment.