Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Commit 4b1a52a

Browse files
committed
Pull request #46: fix playwright to have test on firefox MSIS-3135
Merge in WS/iink-js from MSIS-3135 to MSIS-2936 * commit 'bc7eece7ffcf51d486c2d51482f391f4fa7a8ad1': fix playwright to have test on firefox MSIS-3135
2 parents cf1b10c + bc7eece commit 4b1a52a

File tree

6 files changed

+61
-25
lines changed

6 files changed

+61
-25
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ test-e2e:
4545
EXAMPLES_IP=$$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $(TEST_DOCKER_EXAMPLES_INSTANCE_NAME)); \
4646
fi && \
4747
docker run -i --rm \
48-
-v $(CURRENT_PWD):/tests \
48+
-v $(CURRENT_PWD):/home/pwuser/tests \
49+
--ipc=host \
4950
-e LAUNCH_URL="http://$${EXAMPLES_IP}:$(EXAMPLES_LISTEN_PORT)" \
5051
-e BROWSER=$(BROWSER) \
51-
--ipc=host \
52-
-w "/tests" \
53-
--name "playwright-$(BROWSER)" mcr.microsoft.com/playwright:v1.15.2-bionic \
54-
npm run test:e2e
52+
-w "/home/pwuser/tests" \
53+
--name "playwright-$(BROWSER)-$(BUILDID)" mcr.microsoft.com/playwright:v1.16.0 \
54+
yarn test:e2e
5555

5656
dev-all: dev-examples ## Launch all the requirements for launching tests.
5757

dist/iink.esm.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/iink.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"mocha": "^9.0.3",
5555
"mock-css-modules": "^2.0.0",
5656
"npm-run-all": "^4.1.5",
57-
"playwright": "^1.14.0",
57+
"playwright": "^1.16.0",
5858
"postcss-import": "^12.0.1",
5959
"rollup": "^2.18.0",
6060
"rollup-plugin-commonjs": "^10.1.0",

test/playwright/helper/mochaHooks.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const playwright = require('playwright')
1+
const { chromium, webkit, firefox } = require('playwright')
22

33
exports.mochaHooks = {
44
async beforeAll () {
5-
const browserType = process.env.BROWSER || 'chromium'
5+
const browserName = process.env.BROWSER || 'firefox'
66
let args = []
7-
if (browserType === 'chromium') {
7+
if (browserName === 'chromium') {
88
args = ['--shm-size=5gb', '--disable-dev-shm-usage', '--no-sandbox', '--disable-setuid-sandbox']
99
}
10-
global.browser = await playwright[browserType].launch({ headless: JSON.parse(process.env.HEADLESS), args })
10+
global.browser = await { chromium, webkit, firefox }[browserName].launch({ headless: JSON.parse(process.env.HEADLESS), args })
1111
const context = await browser.newContext()
1212
global.page = await context.newPage()
1313
return Promise.resolve()
@@ -18,8 +18,8 @@ exports.mochaHooks = {
1818
},
1919
async afterEach () {
2020
if (process.env.SCREEN_SHOT) {
21-
const [browserType, exampleFilePath] = this.currentTest.parent.title.split(':')
22-
return await global.page.screenshot({ fullPage: false, path: 'test/playwright/screenshots/' + browserType + '/' + exampleFilePath + '.png' })
21+
const [browserName, exampleFilePath] = this.currentTest.parent.title.split(':')
22+
return await global.page.screenshot({ fullPage: false, path: 'test/playwright/screenshots/' + browserName + '/' + exampleFilePath + '.png' })
2323
}
2424
},
2525
async afterAll () {

yarn.lock

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ acorn@^7.1.1:
10081008
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
10091009
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
10101010

1011-
agent-base@6:
1011+
agent-base@6, agent-base@^6.0.2:
10121012
version "6.0.2"
10131013
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
10141014
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -1574,10 +1574,10 @@ commander@^4.0.1:
15741574
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
15751575
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
15761576

1577-
commander@^6.1.0:
1578-
version "6.2.1"
1579-
resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
1580-
integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
1577+
commander@^8.2.0:
1578+
version "8.3.0"
1579+
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
1580+
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
15811581

15821582
commondir@^1.0.1:
15831583
version "1.0.1"
@@ -1806,7 +1806,7 @@ d3-selection@^1.4.1:
18061806
resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
18071807
integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
18081808

1809-
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
1809+
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
18101810
version "4.3.2"
18111811
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
18121812
integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -2770,6 +2770,11 @@ internal-slot@^1.0.3:
27702770
has "^1.0.3"
27712771
side-channel "^1.0.4"
27722772

2773+
ip@^1.1.5:
2774+
version "1.1.5"
2775+
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
2776+
integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
2777+
27732778
is-absolute-url@^2.0.0:
27742779
version "2.1.0"
27752780
resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -3833,12 +3838,12 @@ pkg-up@^2.0.0:
38333838
dependencies:
38343839
find-up "^2.1.0"
38353840

3836-
playwright@^1.14.0:
3837-
version "1.14.0"
3838-
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.14.0.tgz#18301b11f5278a446d36b5cf96f67db36ce2cd20"
3839-
integrity sha512-aR5oZ1iVsjQkGfYCjgYAmyMAVu0MQ0i8MgdnfdqDu9EVLfbnpuuFmTv/Rb7/Yjno1kOrDUP9+RyNC+zfG3wozA==
3841+
playwright-core@=1.16.0:
3842+
version "1.16.0"
3843+
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.16.0.tgz#c23fca9a0086c00f3e684b1dcaffd2f0d2d55ec6"
3844+
integrity sha512-bJBIceYaNvdGKUreCltfBgsQbvwnWdWd8u+9Ncx9aSHzWUNFDh9cQGTQxqOI2egbMw+ovSG0YU/0lJIzm/Uj/w==
38403845
dependencies:
3841-
commander "^6.1.0"
3846+
commander "^8.2.0"
38423847
debug "^4.1.1"
38433848
extract-zip "^2.0.1"
38443849
https-proxy-agent "^5.0.0"
@@ -3849,10 +3854,19 @@ playwright@^1.14.0:
38493854
proper-lockfile "^4.1.1"
38503855
proxy-from-env "^1.1.0"
38513856
rimraf "^3.0.2"
3857+
socks-proxy-agent "^6.1.0"
38523858
stack-utils "^2.0.3"
38533859
ws "^7.4.6"
3860+
yauzl "^2.10.0"
38543861
yazl "^2.5.1"
38553862

3863+
playwright@^1.16.0:
3864+
version "1.16.0"
3865+
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.16.0.tgz#2a3a87de34dee6aad6d07f6fa05fdb5d57455058"
3866+
integrity sha512-EFjixq8/wT1So6TH1yXoJ3fxFJkEhmmi8BanR5yfCScG76x4WDH0zj8mVkDl9ovfODjy9g6Ba/a/5rXO+0sz6Q==
3867+
dependencies:
3868+
playwright-core "=1.16.0"
3869+
38563870
pngjs@^5.0.0:
38573871
version "5.0.0"
38583872
resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
@@ -4734,6 +4748,11 @@ slice-ansi@^2.1.0:
47344748
astral-regex "^1.0.0"
47354749
is-fullwidth-code-point "^2.0.0"
47364750

4751+
smart-buffer@^4.1.0:
4752+
version "4.2.0"
4753+
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
4754+
integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
4755+
47374756
snapdragon-node@^2.0.1:
47384757
version "2.1.1"
47394758
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -4764,6 +4783,23 @@ snapdragon@^0.8.1:
47644783
source-map-resolve "^0.5.0"
47654784
use "^3.1.0"
47664785

4786+
socks-proxy-agent@^6.1.0:
4787+
version "6.1.0"
4788+
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3"
4789+
integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==
4790+
dependencies:
4791+
agent-base "^6.0.2"
4792+
debug "^4.3.1"
4793+
socks "^2.6.1"
4794+
4795+
socks@^2.6.1:
4796+
version "2.6.1"
4797+
resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
4798+
integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
4799+
dependencies:
4800+
ip "^1.1.5"
4801+
smart-buffer "^4.1.0"
4802+
47674803
source-map-resolve@^0.5.0:
47684804
version "0.5.3"
47694805
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"

0 commit comments

Comments
 (0)