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

fix: properly download browsers (#1173)

Browse source 
Playwright API is parametrized with a `downloadPath` - a path that
is used to download browsers and to look for downloaded browsers.

This patch starts respecting `downloadPath` as part of
`download-browser.js` utility.
This commit is contained in:
Andrey Lushnikov 2020-03-02 11:49:42 -08:00 committed by GitHub
parent cbf65a9c56
commit d5951b4fc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download-browser.js
View file

@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
async function downloadBrowser(browser) { async function downloadBrowser(browserType) {
const browserType = require('.')[browser]; const browser = browserType.name();
let progressBar = null; let progressBar = null;
let lastDownloadedBytes = 0; let lastDownloadedBytes = 0;
function onProgress(downloadedBytes, totalBytes) { function onProgress(downloadedBytes, totalBytes) {

13
install-from-github.js
View file

@ -25,36 +25,37 @@ try {
} catch (e) { } catch (e) {
} }
const {downloadBrowser} = require('./download-browser'); const {downloadBrowser} = require('./download-browser');
const playwright = require('.');
(async function() { (async function() {
const protocolGenerator = require('./utils/protocol-types-generator'); const protocolGenerator = require('./utils/protocol-types-generator');
try { try {
const chromeRevision = await downloadAndCleanup('chromium'); const chromeRevision = await downloadAndCleanup(playwright.chromium);
await protocolGenerator.generateChromiunProtocol(chromeRevision); await protocolGenerator.generateChromiunProtocol(chromeRevision);
} catch (e) { } catch (e) {
console.warn(e.message); console.warn(e.message);
} }
try { try {
const firefoxRevision = await downloadAndCleanup('firefox'); const firefoxRevision = await downloadAndCleanup(playwright.firefox);
await protocolGenerator.generateFirefoxProtocol(firefoxRevision); await protocolGenerator.generateFirefoxProtocol(firefoxRevision);
} catch (e) { } catch (e) {
console.warn(e.message); console.warn(e.message);
} }
try { try {
const webkitRevision = await downloadAndCleanup('webkit'); const webkitRevision = await downloadAndCleanup(playwright.webkit);
await protocolGenerator.generateWebKitProtocol(webkitRevision); await protocolGenerator.generateWebKitProtocol(webkitRevision);
} catch (e) { } catch (e) {
console.warn(e.message); console.warn(e.message);
} }
})(); })();
async function downloadAndCleanup(browser) { async function downloadAndCleanup(browserType) {
const revisionInfo = await downloadBrowser(browser); const revisionInfo = await downloadBrowser(browserType);
// Remove previous revisions. // Remove previous revisions.
const fetcher = require('.')[browser]._createBrowserFetcher(); const fetcher = browserType._createBrowserFetcher();
const localRevisions = await fetcher.localRevisions(); const localRevisions = await fetcher.localRevisions();
const cleanupOldVersions = localRevisions.filter(revision => revision !== revisionInfo.revision).map(revision => fetcher.remove(revision)); const cleanupOldVersions = localRevisions.filter(revision => revision !== revisionInfo.revision).map(revision => fetcher.remove(revision));
await Promise.all([...cleanupOldVersions]); await Promise.all([...cleanupOldVersions]);

3
packages/playwright-chromium/install.js
View file

@ -14,4 +14,5 @@
* limitations under the License. * limitations under the License.
*/ */
const {downloadBrowser} = require('playwright-core/download-browser'); const {downloadBrowser} = require('playwright-core/download-browser');
downloadBrowser('chromium'); const playwright = require('.');
downloadBrowser(playwright.chromium);

3
packages/playwright-firefox/install.js
View file

@ -14,4 +14,5 @@
* limitations under the License. * limitations under the License.
*/ */
const {downloadBrowser} = require('playwright-core/download-browser'); const {downloadBrowser} = require('playwright-core/download-browser');
downloadBrowser('firefox'); const playwright = require('.');
downloadBrowser(playwright.firefox);

3
packages/playwright-webkit/install.js
View file

@ -14,4 +14,5 @@
* limitations under the License. * limitations under the License.
*/ */
const {downloadBrowser} = require('playwright-core/download-browser'); const {downloadBrowser} = require('playwright-core/download-browser');
downloadBrowser('webkit'); const playwright = require('.');
downloadBrowser(playwright.webkit);

7
packages/playwright/install.js
View file

@ -14,8 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
const {downloadBrowser} = require('playwright-core/download-browser'); const {downloadBrowser} = require('playwright-core/download-browser');
const playwright = require('.');
(async function() { (async function() {
await downloadBrowser('chromium'); await downloadBrowser(playwright.chromium);
await downloadBrowser('firefox'); await downloadBrowser(playwright.firefox);
await downloadBrowser('webkit'); await downloadBrowser(playwright.webkit);
})(); })();