Skip to content

Commit

Permalink
feat: increase peerDependencies to allow Puppeteer v2 (#289)
Browse files Browse the repository at this point in the history
* fix: avoid waitForSelector with frames

See puppeteer/puppeteer#2602

* feat: increase peerDependencies for puppeteer@^2.0.0

* feat: upgrade to puppeteer@2.0.0

* chore: build using Node.js 12 LTS

LTS release October 21st https://nodejs.org/en/blog/release/v12.13.0/
  • Loading branch information
colinrotherham authored and gregberge committed Dec 18, 2019
1 parent 1aafdef commit 62a9b81
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 20 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -3,6 +3,7 @@ language: node_js
node_js:
- 8
- 10
- 12

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s
Expand Down
2 changes: 1 addition & 1 deletion examples/create-react-app/package.json
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"jest-puppeteer": "^4.2.0",
"puppeteer": "^1.18.1"
"puppeteer": "^2.0.0"
},
"browserslist": {
"development": [
Expand Down
18 changes: 9 additions & 9 deletions examples/create-react-app/yarn.lock
Expand Up @@ -4729,10 +4729,10 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=

https-proxy-agent@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
https-proxy-agent@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81"
integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==
dependencies:
agent-base "^4.3.0"
debug "^3.1.0"
Expand Down Expand Up @@ -7965,14 +7965,14 @@ punycode@^2.1.0, punycode@^2.1.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

puppeteer@^1.18.1:
version "1.18.1"
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.18.1.tgz#4a66f3bdab01115ededf70443ec904c99917a815"
integrity sha512-luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg==
puppeteer@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz#0612992e29ec418e0a62c8bebe61af1a64d7ec01"
integrity sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA==
dependencies:
debug "^4.1.0"
extract-zip "^1.6.6"
https-proxy-agent "^2.2.1"
https-proxy-agent "^3.0.0"
mime "^2.0.3"
progress "^2.0.1"
proxy-from-env "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -42,7 +42,7 @@
"lerna": "^3.15.0",
"lint-staged": "^9.2.0",
"prettier": "^1.18.2",
"puppeteer": "^1.18.1",
"puppeteer": "^2.0.0",
"puppeteer-firefox": "^0.5.0"
},
"dependencies": {}
Expand Down
4 changes: 2 additions & 2 deletions packages/expect-puppeteer/src/matchers/toClick.test.js
Expand Up @@ -12,14 +12,14 @@ describe('toClick', () => {
})
it('should click using selector', async () => {
await expect(page).toClick('a[href="/page2.html"]')
await page.waitForSelector('html')
await page.waitForNavigation()
const pathname = await page.evaluate(() => document.location.pathname)
expect(pathname).toBe('/page2.html')
})

it('should click using text', async () => {
await expect(page).toClick('a', { text: 'Page 2' })
await page.waitForSelector('html')
await page.waitForNavigation()
const pathname = await page.evaluate(() => document.location.pathname)
expect(pathname).toBe('/page2.html')
})
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-puppeteer-preset/package.json
Expand Up @@ -14,7 +14,7 @@
"chrome-headless"
],
"peerDependencies": {
"puppeteer": "^1.5.0"
"puppeteer": ">= 1.5.0 < 3"
},
"dependencies": {
"expect-puppeteer": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-puppeteer/package.json
Expand Up @@ -13,7 +13,7 @@
"chrome-headless"
],
"peerDependencies": {
"puppeteer": "^1.5.0"
"puppeteer": ">= 1.5.0 < 3"
},
"dependencies": {
"expect-puppeteer": "^4.3.0",
Expand Down
18 changes: 13 additions & 5 deletions yarn.lock
Expand Up @@ -4380,6 +4380,14 @@ https-proxy-agent@^2.2.1:
agent-base "^4.3.0"
debug "^3.1.0"

https-proxy-agent@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81"
integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==
dependencies:
agent-base "^4.3.0"
debug "^3.1.0"

humanize-ms@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
Expand Down Expand Up @@ -7093,14 +7101,14 @@ puppeteer-firefox@^0.5.0:
rimraf "^2.6.1"
ws "^6.1.0"

puppeteer@^1.18.1:
version "1.18.1"
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.18.1.tgz#4a66f3bdab01115ededf70443ec904c99917a815"
integrity sha512-luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg==
puppeteer@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz#0612992e29ec418e0a62c8bebe61af1a64d7ec01"
integrity sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA==
dependencies:
debug "^4.1.0"
extract-zip "^1.6.6"
https-proxy-agent "^2.2.1"
https-proxy-agent "^3.0.0"
mime "^2.0.3"
progress "^2.0.1"
proxy-from-env "^1.0.0"
Expand Down

0 comments on commit 62a9b81

Please sign in to comment.