Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: argos-ci/jest-puppeteer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 108d6f69cb65ae2929c7269aac1c2e4c5077b142
Choose a base ref
...
head repository: argos-ci/jest-puppeteer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc80f623551a199c022c0b26a77050bd20ad48fc
Choose a head ref
  • 4 commits
  • 122 files changed
  • 2 contributors

Commits on Feb 3, 2023

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    6ca8757 View commit details
  2. docs: fix bad links (#511)

    yohabe authored Feb 3, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    96a060d View commit details
  3. feat: target puppeteer v19+

    BREAKING CHANGE: requires puppeteer v19+
    gregberge committed Feb 3, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    31f6f1e View commit details
  4. v7.0.0

    gregberge committed Feb 3, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    cc80f62 View commit details
Showing with 34,957 additions and 25,137 deletions.
  1. +1 −2 .eslintignore
  2. +0 −38 .eslintrc.js
  3. +25 −0 .eslintrc.json
  4. +12 −12 .github/workflows/ci.yml
  5. +1 −1 .gitignore
  6. +0 −4 .husky/pre-commit
  7. +0 −5 .prettierrc
  8. +7 −0 .swcrc
  9. +17 −0 CHANGELOG.md
  10. +4 −45 CONTRIBUTING.md
  11. +77 −77 README.md
  12. +0 −13 babel.config.js
  13. +0 −2 examples/create-react-app/.env
  14. +0 −3 examples/create-react-app/.eslintrc.js
  15. +0 −21 examples/create-react-app/.gitignore
  16. +0 −9 examples/create-react-app/README.md
  17. +0 −37 examples/create-react-app/integration/app.test.js
  18. +0 −4 examples/create-react-app/integration/jest.config.js
  19. +0 −8 examples/create-react-app/jest-puppeteer.config.js
  20. +0 −35 examples/create-react-app/package.json
  21. BIN examples/create-react-app/public/favicon.ico
  22. +0 −40 examples/create-react-app/public/index.html
  23. +0 −15 examples/create-react-app/public/manifest.json
  24. +0 −71 examples/create-react-app/src/App.css
  25. +0 −35 examples/create-react-app/src/App.js
  26. +0 −9 examples/create-react-app/src/App.test.js
  27. +0 −5 examples/create-react-app/src/index.css
  28. +0 −8 examples/create-react-app/src/index.js
  29. +0 −7 examples/create-react-app/src/logo.svg
  30. +0 −117 examples/create-react-app/src/registerServiceWorker.js
  31. +0 −11,699 examples/create-react-app/yarn.lock
  32. +5 −5 jest-puppeteer.config.js
  33. +2 −3 jest.config.js
  34. +3 −5 lerna.json
  35. +32,842 −0 package-lock.json
  36. +18 −33 package.json
  37. +11 −0 packages/expect-puppeteer/CHANGELOG.md
  38. +1 −1 packages/expect-puppeteer/LICENSE
  39. +45 −45 packages/expect-puppeteer/README.md
  40. +6 −0 packages/expect-puppeteer/jest.config.js
  41. +28 −9 packages/expect-puppeteer/package.json
  42. +25 −0 packages/expect-puppeteer/rollup.config.mjs
  43. +44 −46 packages/expect-puppeteer/src/index.js
  44. +18 −18 packages/expect-puppeteer/src/index.test.js
  45. +27 −27 packages/expect-puppeteer/src/matchers/notToMatch.js
  46. +39 −39 packages/expect-puppeteer/src/matchers/notToMatch.test.js
  47. +15 −15 packages/expect-puppeteer/src/matchers/notToMatchElement.js
  48. +42 −42 packages/expect-puppeteer/src/matchers/notToMatchElement.test.js
  49. +21 −20 packages/expect-puppeteer/src/matchers/setupPage.js
  50. +4 −4 packages/expect-puppeteer/src/matchers/toClick.js
  51. +118 −115 packages/expect-puppeteer/src/matchers/toClick.test.js
  52. +7 −7 packages/expect-puppeteer/src/matchers/toDisplayDialog.js
  53. +10 −10 packages/expect-puppeteer/src/matchers/toDisplayDialog.test.js
  54. +17 −17 packages/expect-puppeteer/src/matchers/toFill.js
  55. +82 −82 packages/expect-puppeteer/src/matchers/toFill.test.js
  56. +7 −7 packages/expect-puppeteer/src/matchers/toFillForm.js
  57. +55 −51 packages/expect-puppeteer/src/matchers/toFillForm.test.js
  58. +32 −32 packages/expect-puppeteer/src/matchers/toMatch.js
  59. +46 −46 packages/expect-puppeteer/src/matchers/toMatch.test.js
  60. +43 −43 packages/expect-puppeteer/src/matchers/toMatchElement.js
  61. +101 −97 packages/expect-puppeteer/src/matchers/toMatchElement.test.js
  62. +26 −26 packages/expect-puppeteer/src/matchers/toSelect.js
  63. +60 −54 packages/expect-puppeteer/src/matchers/toSelect.test.js
  64. +5 −5 packages/expect-puppeteer/src/matchers/toUploadFile.js
  65. +35 −35 packages/expect-puppeteer/src/matchers/toUploadFile.test.js
  66. +7 −7 packages/expect-puppeteer/src/options.js
  67. +14 −10 packages/expect-puppeteer/src/options.test.js
  68. +22 −25 packages/expect-puppeteer/src/utils.js
  69. +11 −0 packages/jest-dev-server/CHANGELOG.md
  70. +1 −1 packages/jest-dev-server/LICENSE
  71. +39 −39 packages/jest-dev-server/README.md
  72. +0 −7 packages/jest-dev-server/index.js
  73. +30 −11 packages/jest-dev-server/package.json
  74. +25 −0 packages/jest-dev-server/rollup.config.mjs
  75. +103 −103 packages/jest-dev-server/src/{global.js → index.js}
  76. +11 −0 packages/jest-environment-puppeteer/CHANGELOG.md
  77. +33 −33 packages/jest-environment-puppeteer/README.md
  78. +3 −3 packages/jest-environment-puppeteer/index.js
  79. +6 −0 packages/jest-environment-puppeteer/jest.config.js
  80. +32 −11 packages/jest-environment-puppeteer/package.json
  81. +33 −0 packages/jest-environment-puppeteer/rollup.config.mjs
  82. +1 −1 packages/jest-environment-puppeteer/setup.js
  83. +82 −68 packages/jest-environment-puppeteer/src/{PuppeteerEnvironment.js → env.js}
  84. +41 −41 packages/jest-environment-puppeteer/src/global.js
  85. +35 −38 packages/jest-environment-puppeteer/src/readConfig.js
  86. +1 −1 packages/jest-environment-puppeteer/teardown.js
  87. +1 −1 packages/jest-environment-puppeteer/tests/.eslintrc.js
  88. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/browserConfig.js
  89. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/browserConfigChromium.js
  90. +3 −3 packages/jest-environment-puppeteer/tests/__fixtures__/browserLaunchConfig.js
  91. +3 −3 packages/jest-environment-puppeteer/tests/__fixtures__/browserLaunchProductConfig.js
  92. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/browserWsEndpointConfig.js
  93. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/customConfig.js
  94. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/invalidProduct.js
  95. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/launchConfig.js
  96. +2 −2 packages/jest-environment-puppeteer/tests/__fixtures__/promiseConfig.js
  97. +7 −7 packages/jest-environment-puppeteer/tests/basic.test.js
  98. +8 −8 packages/jest-environment-puppeteer/tests/browserContext-1.test.js
  99. +8 −8 packages/jest-environment-puppeteer/tests/browserContext-2.test.js
  100. +112 −112 packages/jest-environment-puppeteer/tests/readConfig.test.js
  101. +9 −9 packages/jest-environment-puppeteer/tests/resetBrowser.test.js
  102. +9 −9 packages/jest-environment-puppeteer/tests/resetPage.test.js
  103. +17 −17 packages/jest-environment-puppeteer/tests/runBeforeUnloadOnClose.test.js
  104. +35 −36 packages/jest-environment-puppeteer/tests/setup.test.js
  105. +17 −0 packages/jest-puppeteer-preset/CHANGELOG.md
  106. +2 −2 packages/jest-puppeteer-preset/README.md
  107. +5 −5 packages/jest-puppeteer-preset/jest-preset.js
  108. +20 −8 packages/jest-puppeteer-preset/package.json
  109. +17 −0 packages/jest-puppeteer/CHANGELOG.md
  110. +2 −2 packages/jest-puppeteer/README.md
  111. +5 −5 packages/jest-puppeteer/jest-preset.js
  112. +20 −7 packages/jest-puppeteer/package.json
  113. +11 −0 packages/spawnd/CHANGELOG.md
  114. +4 −4 packages/spawnd/README.md
  115. +24 −9 packages/spawnd/package.json
  116. +25 −0 packages/spawnd/rollup.config.mjs
  117. +21 −21 packages/spawnd/src/index.js
  118. +2 −2 server/.eslintrc.js
  119. +5 −5 server/index.js
  120. +36 −38 server/public/index.html
  121. +1 −1 server/public/page2.html
  122. +0 −11,141 yarn.lock
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
lib/
node_modules/
examples/
node_modules/
38 changes: 0 additions & 38 deletions .eslintrc.js

This file was deleted.

25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"root": true,
"env": {
"es6": true,
"node": true,
"browser": true
},
"extends": ["eslint:recommended"],
"parserOptions": {
"ecmaVersion": 2022,
"sourceType": "module"
},
"globals": {
"jestPuppeteer": "readonly",
"page": "readonly"
},
"overrides": [
{
"files": ["*.test.?(m|t)js"],
"env": {
"jest": true
}
}
]
}
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -6,22 +6,22 @@ on:
- master

jobs:

Test:
strategy:
fail-fast: false
matrix:
node_version: [14, 16, 'lts/*', 'node']
node-version: [14, 16, 18, "latest"]
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
check-latest: true
- name: Install Dependencies
run: yarn
- name: Run Tests 👩🏽‍💻
run: yarn ci
node-version: ${{ matrix.node-version }}
- name: Install last npm version
if: ${{ matrix.node-version == 14 }}
run: npm install -g npm@latest
- run: npm ci
- run: npm run build
- run: npm run lint
- run: npm run test -- --ci
- run: npm run test:incognito -- --ci
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node_modules/
lib/
yarn-error.log
screenshots/
4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

7 changes: 7 additions & 0 deletions .swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://json.schemastore.org/swcrc",
"jsc": {
"target": "es2022"
},
"sourceMaps": true
}
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,23 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [7.0.0](https://github.com/smooth-code/jest-puppeteer/compare/v6.2.0...v7.0.0) (2023-02-03)


### Features

* modernize project ([#514](https://github.com/smooth-code/jest-puppeteer/issues/514)) ([6ca8757](https://github.com/smooth-code/jest-puppeteer/commit/6ca8757452e33d00a1a841d6f18b032411f4bdb6))
* target puppeteer v19+ ([31f6f1e](https://github.com/smooth-code/jest-puppeteer/commit/31f6f1e5de72edc639db65cd6688eab7c02693ac))


### BREAKING CHANGES

* requires puppeteer v19+





# [6.2.0](https://github.com/smooth-code/jest-puppeteer/compare/v6.1.1...v6.2.0) (2022-12-11)

### Bug Fixes
49 changes: 4 additions & 45 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -26,40 +26,13 @@ _Before_ submitting a pull request, please make sure the following is done…

Note: Replace `<your_username>` with your GitHub username

2. jest-puppeteer uses [Yarn](https://code.fb.com/web/yarn-a-new-package-manager-for-javascript/) for running development scripts. If you haven't already done so, please [install yarn](https://yarnpkg.com/en/docs/install).
2. Run `npm install`.

3. Run `yarn install`. On Windows: To install [Yarn](https://yarnpkg.com/en/docs/install#windows-tab) on Windows you may need to download either node.js or Chocolatey<br />
3. If you've changed APIs, update the documentation.

```sh
yarn install
```

To check your version of Yarn and ensure it's installed you can type:

```sh
yarn --version
```

4. If you've added code that should be tested, add tests. You can use watch mode that continuously transforms changed files to make your life easier.

```sh
# in the background
yarn run dev
```

5. If you've changed APIs, update the documentation.

6. Ensure the linting is good via `yarn lint`.

```sh-session
$ yarn lint
```

7. Ensure the test suite passes via `yarn test`.
4. Ensure the linting is good via `npm run lint`.

```sh-session
$ yarn test
```
5. Ensure the test suite passes via `npm run test`.

## Bugs

@@ -75,20 +48,6 @@ The best way to get your bug fixed is to provide a reduced test case. Please pro

Please follow the `.prettierrc` in the project.

## Credits

This project exists thanks to all the people who [contribute](CONTRIBUTING.md). <a href="graphs/contributors"><img src="https://opencollective.com/jest-puppeteer/contributors.svg?width=890&button=false" /></a>

### [Backers](https://opencollective.com/jest-puppeteer#backer)

Thank you to all our backers! 🙏

<a href="https://opencollective.com/jest-puppeteer#backers" target="_blank"><img src="https://opencollective.com/jest-puppeteer/backers.svg?width=890"></a>

### [Sponsors](https://opencollective.com/jest-puppeteer#sponsor)

Support this project by becoming a sponsor. Your logo will show up here with a link to your website.

## License

By contributing to jest-puppeteer, you agree that your contributions will be licensed under its MIT license.
Loading