Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tests failing in headful #8273

Merged
merged 8 commits into from May 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -204,8 +204,11 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install xvfb
# Ensure both a Chromium and a Firefox binary are available.
PUPPETEER_PRODUCT=firefox npm install
npm install
ls .local-chromium
ls .local-chromium .local-firefox

- name: Build
run: |
npm run build
Expand Down
1 change: 1 addition & 0 deletions src/node/Launcher.ts
Expand Up @@ -203,6 +203,7 @@ class ChromeLauncher implements ProductLauncher {

defaultArgs(options: BrowserLaunchArgumentOptions = {}): string[] {
const chromeArguments = [
'--allow-pre-commit-input', // TODO(crbug.com/1320996): neither headful nor headless should rely on this flag.
ergunsh marked this conversation as resolved.
Show resolved Hide resolved
'--disable-background-networking',
'--enable-features=NetworkService,NetworkServiceInProcess',
'--disable-background-timer-throttling',
Expand Down
2 changes: 1 addition & 1 deletion test/launcher.spec.ts
Expand Up @@ -548,12 +548,12 @@ describe('Launcher specs', function () {
async () => {
const { defaultBrowserOptions, puppeteer } = getTestState();
const options = {
args: ['--no-startup-window'],
waitForInitialPage: false,
// This is needed to prevent Puppeteer from adding an initial blank page.
// See also https://github.com/puppeteer/puppeteer/blob/ad6b736039436fcc5c0a262e5b575aa041427be3/src/node/Launcher.ts#L200
ignoreDefaultArgs: true,
...defaultBrowserOptions,
args: ['--no-startup-window'],
};
const browser = await puppeteer.launch(options);
const pages = await browser.pages();
Expand Down
32 changes: 26 additions & 6 deletions test/network.spec.ts
Expand Up @@ -227,7 +227,10 @@ describe('network', function () {
const { page, server } = getTestState();

const responses = new Map();
page.on('response', (r) => responses.set(r.url().split('/').pop(), r));
page.on(
'response',
(r) => !utils.isFavicon(r) && responses.set(r.url().split('/').pop(), r)
);

// Load and re-load to make sure serviceworker is installed and running.
await page.goto(server.PREFIX + '/serviceworkers/fetch/sw.html', {
Expand All @@ -251,7 +254,9 @@ describe('network', function () {
await page.goto(server.EMPTY_PAGE);
server.setRoute('/post', (req, res) => res.end());
let request = null;
page.on('request', (r) => (request = r));
page.on('request', (r) => {
if (!utils.isFavicon(r)) request = r;
});
await page.evaluate(() =>
fetch('./post', {
method: 'POST',
Expand Down Expand Up @@ -652,8 +657,16 @@ describe('network', function () {
const { page, server } = getTestState();

server.setAuth('/empty.html', 'user', 'pass');
let response = await page.goto(server.EMPTY_PAGE);
expect(response.status()).toBe(401);
let response;
try {
response = await page.goto(server.EMPTY_PAGE);
expect(response.status()).toBe(401);
} catch (error) {
// In headful, an error is thrown instead of 401.
if (!error.message.startsWith('net::ERR_INVALID_AUTH_CREDENTIALS')) {
throw error;
}
}
await page.authenticate({
username: 'user',
password: 'pass',
Expand Down Expand Up @@ -686,8 +699,15 @@ describe('network', function () {
expect(response.status()).toBe(200);
await page.authenticate(null);
// Navigate to a different origin to bust Chrome's credential caching.
response = await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
expect(response.status()).toBe(401);
try {
response = await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
expect(response.status()).toBe(401);
} catch (error) {
// In headful, an error is thrown instead of 401.
if (!error.message.startsWith('net::ERR_INVALID_AUTH_CREDENTIALS')) {
throw error;
}
}
});
it('should not disable caching', async () => {
const { page, server } = getTestState();
Expand Down
19 changes: 15 additions & 4 deletions test/proxy.spec.ts
Expand Up @@ -43,6 +43,9 @@ describeFailsFirefox('request proxy', () => {
let proxiedRequestUrls: string[];
let proxyServer: Server;
let proxyServerUrl: string;
const defaultArgs = [
'--disable-features=NetworkTimeServiceQuerying', // We disable this in tests so that proxy-related tests don't intercept queries from this service in headful.
];

beforeEach(() => {
proxiedRequestUrls = [];
Expand Down Expand Up @@ -100,7 +103,7 @@ describeFailsFirefox('request proxy', () => {

browser = await puppeteer.launch({
...defaultBrowserOptions,
args: [`--proxy-server=${proxyServerUrl}`],
args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`],
});

const page = await browser.newPage();
Expand All @@ -118,6 +121,7 @@ describeFailsFirefox('request proxy', () => {
browser = await puppeteer.launch({
...defaultBrowserOptions,
args: [
...defaultArgs,
`--proxy-server=${proxyServerUrl}`,
`--proxy-bypass-list=${new URL(emptyPageUrl).host}`,
],
Expand All @@ -138,7 +142,7 @@ describeFailsFirefox('request proxy', () => {

browser = await puppeteer.launch({
...defaultBrowserOptions,
args: [`--proxy-server=${proxyServerUrl}`],
args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`],
});

const context = await browser.createIncognitoBrowserContext();
Expand All @@ -157,6 +161,7 @@ describeFailsFirefox('request proxy', () => {
browser = await puppeteer.launch({
...defaultBrowserOptions,
args: [
...defaultArgs,
`--proxy-server=${proxyServerUrl}`,
`--proxy-bypass-list=${new URL(emptyPageUrl).host}`,
],
Expand All @@ -180,7 +185,10 @@ describeFailsFirefox('request proxy', () => {
const { puppeteer, defaultBrowserOptions, server } = getTestState();
const emptyPageUrl = getEmptyPageUrl(server);

browser = await puppeteer.launch(defaultBrowserOptions);
browser = await puppeteer.launch({
...defaultBrowserOptions,
args: defaultArgs,
});

const context = await browser.createIncognitoBrowserContext({
proxyServer: proxyServerUrl,
Expand All @@ -198,7 +206,10 @@ describeFailsFirefox('request proxy', () => {
const { puppeteer, defaultBrowserOptions, server } = getTestState();
const emptyPageUrl = getEmptyPageUrl(server);

browser = await puppeteer.launch(defaultBrowserOptions);
browser = await puppeteer.launch({
...defaultBrowserOptions,
args: defaultArgs,
});

const context = await browser.createIncognitoBrowserContext({
proxyServer: proxyServerUrl,
Expand Down
2 changes: 1 addition & 1 deletion test/requestinterception-experimental.spec.ts
Expand Up @@ -458,7 +458,7 @@ describe('request interception', function () {
await page.setRequestInterception(true);
const requests = [];
page.on('request', (request) => {
requests.push(request);
!utils.isFavicon(request) && requests.push(request);
request.continue({}, 0);
});
const dataURL = 'data:text/html,<div>yo</div>';
Expand Down
2 changes: 1 addition & 1 deletion test/requestinterception.spec.ts
Expand Up @@ -381,7 +381,7 @@ describe('request interception', function () {
await page.setRequestInterception(true);
const requests = [];
page.on('request', (request) => {
requests.push(request);
!utils.isFavicon(request) && requests.push(request);
request.continue();
});
const dataURL = 'data:text/html,<div>yo</div>';
Expand Down