Skip to content

Commit fa34827

Browse files
committed
Merge branch 'main' into use-expect-async-matchers-with-jasmine
2 parents 99530f5 + ba021e6 commit fa34827

7 files changed

Lines changed: 183 additions & 207 deletions

File tree

playgrounds/jasmine/test/specs/globalImport/jasmine-specific.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ describe('Jasmine-Specific Features', () => {
214214
await expect(Promise.resolve(1)).toBeResolved()
215215
await expect(Promise.reject('fail')).toBeRejected()
216216

217-
// @ts-expect-error -- toThrowError is not recognized properly to fix one day
217+
// @ts-expect-error -- toThrowError is not recognized properly fix incoming
218218
await expect(Promise.resolve(42)).toBeResolvedTo(42)
219-
// @ts-expect-error -- toBeRejectedWith is not recognized properly to fix one day
219+
// @ts-expect-error -- toBeRejectedWith is not recognized properly fix incoming
220220
await expect(Promise.reject('fail')).toBeRejectedWith('fail')
221221

222222
await expect(() => { throw new Error('fail') }).toThrowError('fail')

playgrounds/jasmine/test/specs/globalImport/wdio-matchers.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { browser, $, $$ } from '@wdio/globals'
2+
import { expect } from 'expect-webdriverio'
23

34
describe('WebdriverIO Custom Matchers', () => {
45
beforeEach(async () => {

playgrounds/jasmine/wdio.conf.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export const config: WebdriverIO.Config = {
1717
specs: [
1818
'./test/specs/**/*.test.ts',
1919
//'./test/specs/expect-wdioImport/basic-matchers.test.ts',
20-
// './test/specs/expect-wdioImport/wdio-matchers.test.ts'
21-
// './test/specs/globalImport/jasmine-specific.test.ts',
20+
//'./test/specs/expect-wdioImport/wdio-matchers.test.ts'
21+
//'./test/specs/globalImport/jasmine-specific.test.ts',
2222
//'./test/specs/globalImport/snapshot.test.ts',
2323
],
2424

@@ -48,7 +48,7 @@ export const config: WebdriverIO.Config = {
4848
connectionRetryCount: 3,
4949
services: [
5050
// SoftAssertionService is not supported since anyway Jasmine is designed that way out of the box
51-
// visual snapshot service does not work properly with Jasmine due to the lack of proper hooks
51+
// visual snapshot service does not work properly with Jasmine due to the lack of proper hooks.
5252
],
5353
framework: 'jasmine',
5454
reporters: ['spec'],

playgrounds/jest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Jest Playground
22

3-
This is a playground for E2E testing with Jest, ensuring the compatibility of `expect-webdriverio` and primarily serving to test Jest augmentation.
3+
This is a playground for E2E testing with Jest, ensuring the compatibility of `expect-webdriverio` and primarily serving to test Jest augmentation using a standalone wdio project.
44

55
## Notes and Limitations
66

playgrounds/jest/jest.config.mjs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { inject } from "vitest";
2-
31
export default {
42
preset: 'ts-jest/presets/default-esm',
53
moduleNameMapper: {

playgrounds/jest/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"typecheck": "tsc --noEmit",
88
"test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --verbose",
99
"lint": "eslint .",
10-
"checks:all": "npm run typecheck && npm run lint && npm test",
11-
"snapshots:update": "npm run test -- --spec snapshot.test.ts --updateSnapshots"
10+
"checks:all": "npm run typecheck && npm run lint && npm test"
1211
},
1312
"devDependencies": {
1413
"@types/jest": "^30.0.0",
15-
"eslint-plugin-jest": "^29.15.0",
14+
"eslint-plugin-jest": "^29.15.2",
1615
"expect-webdriverio": "file:../..",
17-
"jest": "^30.3.0",
18-
"ts-jest": "^29.4.6"
16+
"jest": "^30.4.2",
17+
"ts-jest": "^29.4.11"
1918
},
2019
"peerDependencies": {
2120
"@wdio/cli": "*",

0 commit comments

Comments
 (0)