From 62ce5a6351677c8eee9cc1d142f4268f44eaffcf Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 24 Jan 2020 13:49:40 -0800 Subject: [PATCH] chore: replace pptr with pw --- .ci/node10/Dockerfile.linux | 8 ++++---- .ci/node12/Dockerfile.linux | 8 ++++---- .ci/node8/Dockerfile.linux | 8 ++++---- docs/troubleshooting.md | 2 +- test/chromium/coverage.spec.js | 2 +- test/chromium/headful.spec.js | 2 +- test/chromium/launcher.spec.js | 2 +- test/elementhandle.spec.js | 4 ++-- test/launcher.spec.js | 2 +- test/test.js | 4 ++-- utils/testrunner/README.md | 4 ++-- utils/testrunner/package.json | 2 +- utils/testserver/README.md | 2 +- utils/testserver/package.json | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.ci/node10/Dockerfile.linux b/.ci/node10/Dockerfile.linux index a7cf643b8d..fb3ac530f5 100644 --- a/.ci/node10/Dockerfile.linux +++ b/.ci/node10/Dockerfile.linux @@ -9,9 +9,9 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Add user so we don't need --no-sandbox. -RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \ - && mkdir -p /home/pptruser/Downloads \ - && chown -R pptruser:pptruser /home/pptruser +RUN groupadd -r pwuser && useradd -r -g pwuser -G audio,video pwuser \ + && mkdir -p /home/pwuser/Downloads \ + && chown -R pwuser:pwuser /home/pwuser # Run everything after as non-privileged user. -USER pptruser +USER pwuser diff --git a/.ci/node12/Dockerfile.linux b/.ci/node12/Dockerfile.linux index 79f9426157..64f58d6199 100644 --- a/.ci/node12/Dockerfile.linux +++ b/.ci/node12/Dockerfile.linux @@ -9,9 +9,9 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Add user so we don't need --no-sandbox. -RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \ - && mkdir -p /home/pptruser/Downloads \ - && chown -R pptruser:pptruser /home/pptruser +RUN groupadd -r pwuser && useradd -r -g pwuser -G audio,video pwuser \ + && mkdir -p /home/pwuser/Downloads \ + && chown -R pwuser:pwuser /home/pwuser # Run everything after as non-privileged user. -USER pptruser +USER pwuser diff --git a/.ci/node8/Dockerfile.linux b/.ci/node8/Dockerfile.linux index 26f1197984..6f2d3d8a52 100644 --- a/.ci/node8/Dockerfile.linux +++ b/.ci/node8/Dockerfile.linux @@ -9,9 +9,9 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Add user so we don't need --no-sandbox. -RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \ - && mkdir -p /home/pptruser/Downloads \ - && chown -R pptruser:pptruser /home/pptruser +RUN groupadd -r pwuser && useradd -r -g pwuser -G audio,video pwuser \ + && mkdir -p /home/pwuser/Downloads \ + && chown -R pwuser:pwuser /home/pwuser # Run everything after as non-privileged user. -USER pptruser +USER pwuser diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 05747c689b..36cf736dbd 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -269,7 +269,7 @@ This will write shared memory files into `/tmp` instead of `/dev/shm`. See [crbu Seeing other weird errors when launching Chrome? Try running your container with `docker run --cap-add=SYS_ADMIN` when developing locally. Since the Dockerfile -adds a `pptr` user as a non-privileged user, it may not have all the necessary privileges. +adds a `pwuser` user as a non-privileged user, it may not have all the necessary privileges. [dumb-init](https://github.com/Yelp/dumb-init) is worth checking out if you're experiencing a lot of zombies Chrome processes sticking around. There's special diff --git a/test/chromium/coverage.spec.js b/test/chromium/coverage.spec.js index 37e79b3464..45a49009ca 100644 --- a/test/chromium/coverage.spec.js +++ b/test/chromium/coverage.spec.js @@ -51,7 +51,7 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT}) expect(coverage.find(entry => entry.url.startsWith('debugger://'))).not.toBe(null); expect(coverage.length).toBe(2); }); - it('should ignore pptr internal scripts if reportAnonymousScripts is true', async function({page, server}) { + it('should ignore playwright internal scripts if reportAnonymousScripts is true', async function({page, server}) { await page.coverage.startJSCoverage({reportAnonymousScripts: true}); await page.goto(server.EMPTY_PAGE); await page.evaluate('console.log("foo")'); diff --git a/test/chromium/headful.spec.js b/test/chromium/headful.spec.js index 0e54ba4365..15ea7ca6f2 100644 --- a/test/chromium/headful.spec.js +++ b/test/chromium/headful.spec.js @@ -22,7 +22,7 @@ const util = require('util'); const rmAsync = util.promisify(require('rimraf')); const mkdtempAsync = util.promisify(fs.mkdtemp); -const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-'); +const TMP_FOLDER = path.join(os.tmpdir(), 'pw_tmp_folder-'); module.exports.describe = function({testRunner, expect, playwright, defaultBrowserOptions, FFOX, CHROMIUM, WEBKIT}) { const {describe, xdescribe, fdescribe} = testRunner; diff --git a/test/chromium/launcher.spec.js b/test/chromium/launcher.spec.js index e6d7cede93..30e14c6661 100644 --- a/test/chromium/launcher.spec.js +++ b/test/chromium/launcher.spec.js @@ -23,7 +23,7 @@ const rmAsync = util.promisify(require('rimraf')); const mkdtempAsync = util.promisify(fs.mkdtemp); const statAsync = util.promisify(fs.stat); -const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-'); +const TMP_FOLDER = path.join(os.tmpdir(), 'pw_tmp_folder-'); module.exports.describe = function({testRunner, expect, defaultBrowserOptions, playwright, WIN}) { const {describe, xdescribe, fdescribe} = testRunner; diff --git a/test/elementhandle.spec.js b/test/elementhandle.spec.js index 89faa85f4c..8cfd2b57ac 100644 --- a/test/elementhandle.spec.js +++ b/test/elementhandle.spec.js @@ -58,12 +58,12 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT}) `); const element = await page.$('#therect'); - const pptrBoundingBox = await element.boundingBox(); + const pwBoundingBox = await element.boundingBox(); const webBoundingBox = await page.evaluate(e => { const rect = e.getBoundingClientRect(); return {x: rect.x, y: rect.y, width: rect.width, height: rect.height}; }, element); - expect(pptrBoundingBox).toEqual(webBoundingBox); + expect(pwBoundingBox).toEqual(webBoundingBox); }); }); diff --git a/test/launcher.spec.js b/test/launcher.spec.js index b34fd27fb3..5359f927e5 100644 --- a/test/launcher.spec.js +++ b/test/launcher.spec.js @@ -24,7 +24,7 @@ const utils = require('./utils'); const rmAsync = util.promisify(require('rimraf')); const mkdtempAsync = util.promisify(fs.mkdtemp); -const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-'); +const TMP_FOLDER = path.join(os.tmpdir(), 'pw_tmp_folder-'); module.exports.describe = function({testRunner, expect, defaultBrowserOptions, playwright, playwrightPath, product, CHROMIUM, FFOX, WEBKIT}) { const {describe, xdescribe, fdescribe} = testRunner; diff --git a/test/test.js b/test/test.js index e42dbd2793..79d586db35 100644 --- a/test/test.js +++ b/test/test.js @@ -20,8 +20,8 @@ const {TestRunner, Reporter} = require('../utils/testrunner/'); const utils = require('./utils'); let parallel = 1; -if (process.env.PPTR_PARALLEL_TESTS) - parallel = parseInt(process.env.PPTR_PARALLEL_TESTS.trim(), 10); +if (process.env.PW_PARALLEL_TESTS) + parallel = parseInt(process.env.PW_PARALLEL_TESTS.trim(), 10); const parallelArgIndex = process.argv.indexOf('-j'); if (parallelArgIndex !== -1) parallel = parseInt(process.argv[parallelArgIndex + 1], 10); diff --git a/utils/testrunner/README.md b/utils/testrunner/README.md index 8548d52978..975cec790c 100644 --- a/utils/testrunner/README.md +++ b/utils/testrunner/README.md @@ -11,7 +11,7 @@ This test runner is used internally by Playwright to test Playwright itself. ### Installation ```sh -npm install --save-dev @pptr/testrunner +npm install --save-dev @playwright/testrunner ``` ### Example @@ -23,7 +23,7 @@ node test.js ``` ```js -const {TestRunner, Reporter, Matchers} = require('@pptr/testrunner'); +const {TestRunner, Reporter, Matchers} = require('@playwright/testrunner'); // Runner holds and runs all the tests const runner = new TestRunner({ diff --git a/utils/testrunner/package.json b/utils/testrunner/package.json index acccef8473..38f0ad714b 100644 --- a/utils/testrunner/package.json +++ b/utils/testrunner/package.json @@ -1,5 +1,5 @@ { - "name": "@pptr/testrunner", + "name": "@playwright/testrunner", "version": "0.8.0", "description": "Playwright testrunner", "main": "index.js", diff --git a/utils/testserver/README.md b/utils/testserver/README.md index c9b4e7cc2c..fe7ddc30a9 100644 --- a/utils/testserver/README.md +++ b/utils/testserver/README.md @@ -5,7 +5,7 @@ This test server is used internally by Playwright to test Playwright itself. ### Example ```js -const {TestServer} = require('@pptr/testserver'); +const {TestServer} = require('@playwright/testrunner'); (async(() => { const httpServer = await TestServer.create(__dirname, 8000), diff --git a/utils/testserver/package.json b/utils/testserver/package.json index 086be677bf..9a4aa7ff8c 100644 --- a/utils/testserver/package.json +++ b/utils/testserver/package.json @@ -1,5 +1,5 @@ { - "name": "@pptr/testserver", + "name": "@playwright/testrunner", "version": "0.5.0", "description": "testing server", "main": "index.js",