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.

Sign up for GitHub

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: support relative downloadsPath directory for downloads #6402

Merged
merged 4 commits into from
May 5, 2021
Merged

fix: support relative downloadsPath directory for downloads #6402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b497b81
test: add test for relative downloadsPath folder
mxschmitt May 4, 2021
3feec39
fix: path normalisation to an absolute path
mxschmitt May 4, 2021
4cfcc6c
remove forbidOnly hack
mxschmitt May 4, 2021
c954f76
doing it now in validateLaunchOptions
mxschmitt May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/server/browserType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,10 @@ function copyTestHooks(from: object, to: object) {

function validateLaunchOptions<Options extends types.LaunchOptions>(options: Options): Options {
const { devtools = false } = options;
let { headless = !devtools } = options;
let { headless = !devtools, downloadsPath } = options;
if (debugMode())
headless = false;
return { ...options, devtools, headless };
if (downloadsPath && !path.isAbsolute(downloadsPath))
downloadsPath = path.join(process.cwd(), downloadsPath);
return { ...options, devtools, headless, downloadsPath };
}
15 changes: 15 additions & 0 deletions tests/downloads-path.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import { playwrightTest as it, expect } from './config/browserTest';
import fs from 'fs';
import path from 'path';

it.describe('downloads path', () => {
it.beforeEach(async ({server}) => {
Expand Down Expand Up @@ -71,6 +72,20 @@ it.describe('downloads path', () => {
await downloadsBrowser.close();
});

it('should report downloads in downloadsPath folder with a relative path', async ({browserType, browserOptions, server}, testInfo) => {
const downloadsBrowser = await browserType.launch({ ...browserOptions, downloadsPath: path.relative(process.cwd(), testInfo.outputPath('')) });
const page = await downloadsBrowser.newPage({ acceptDownloads: true });
await page.setContent(`<a href="${server.PREFIX}/download">download</a>`);
const [ download ] = await Promise.all([
page.waitForEvent('download'),
page.click('a')
]);
const downloadPath = await download.path();
expect(downloadPath.startsWith(testInfo.outputPath(''))).toBeTruthy();
await page.close();
await downloadsBrowser.close();
});

it('should accept downloads in persistent context', async ({launchPersistent, server}, testInfo) => {
const { context, page } = await launchPersistent({ acceptDownloads: true, downloadsPath: testInfo.outputPath('') });
await page.setContent(`<a href="${server.PREFIX}/download">download</a>`);
Expand Down