Skip to content

Commit 043ba68

Browse files
dprevost-LMIdprevost-LMI
committed
chore: ensure using expect(result.message()).toContain('not') 
1 parent 3bca1cb commit 043ba68

11 files changed

+27
-45
lines changed

‎test/matchers/beMatchers.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
3-
import { getExpectMessage, getReceived, matcherNameToString } from '../__fixtures__/utils.js'
3+
import { getExpectMessage, matcherNameToString } from '../__fixtures__/utils.js'
44
import * as Matchers from '../../src/matchers.js'
55

66
vi.mock('@wdio/globals')
@@ -96,9 +96,8 @@ describe('be* matchers', () => {
9696

9797
test('not - failure', async () => {
9898
const result = await fn.call({ isNot: true }, $('sel'), { wait: 0 }) as ExpectWebdriverIO.AssertionResult
99-
const received = getReceived(result.message())
10099

101-
expect(received).toContain('not')
100+
expect(result.message()).toContain('not')
102101
expect(result.pass).toBe(false)
103102
})
104103

@@ -115,9 +114,8 @@ describe('be* matchers', () => {
115114

116115
test('not - failure (with wait)', async () => {
117116
const result = await fn.call({ isNot: true }, $('sel'), { wait: 1 }) as ExpectWebdriverIO.AssertionResult
118-
const received = getReceived(result.message())
119117

120-
expect(received).toContain('not')
118+
expect(result.message()).toContain('not')
121119
expect(result.pass).toBe(false)
122120
})
123121

‎test/matchers/element/toBeDisabled.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
33

4-
import { getExpectMessage, getReceived } from '../../__fixtures__/utils.js'
4+
import { getExpectMessage } from '../../__fixtures__/utils.js'
55
import { toBeDisabled } from '../../../src/matchers/element/toBeDisabled.js'
66

77
vi.mock('@wdio/globals')
@@ -93,9 +93,8 @@ describe('toBeDisabled', () => {
9393
return false
9494
}
9595
const result = await toBeDisabled.call({ isNot: true }, el, { wait: 0 })
96-
const received = getReceived(result.message())
9796

98-
expect(received).toContain('not')
97+
expect(result.message()).toContain('not')
9998
expect(result.pass).toBe(false)
10099
})
101100

@@ -115,9 +114,8 @@ describe('toBeDisabled', () => {
115114
return false
116115
}
117116
const result = await toBeDisabled.call({ isNot: true }, el, { wait: 1 })
118-
const received = getReceived(result.message())
119117

120-
expect(received).toContain('not')
118+
expect(result.message()).toContain('not')
121119
expect(result.pass).toBe(false)
122120
})
123121

‎test/matchers/element/toBeDisplayed.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
33

4-
import { getExpectMessage, getReceived } from '../../__fixtures__/utils.js'
4+
import { getExpectMessage } from '../../__fixtures__/utils.js'
55
import { toBeDisplayed } from '../../../src/matchers/element/toBeDisplayed.js'
66

77
vi.mock('@wdio/globals')
@@ -93,9 +93,8 @@ describe('toBeDisplayed', () => {
9393
return true
9494
}
9595
const result = await toBeDisplayed.call({ isNot: true }, el, {}, { wait: 0 })
96-
const received = getReceived(result.message())
9796

98-
expect(received).toContain('not')
97+
expect(result.message()).toContain('not')
9998
expect(result.pass).toBe(false)
10099
})
101100

@@ -115,9 +114,8 @@ describe('toBeDisplayed', () => {
115114
return true
116115
}
117116
const result = await toBeDisplayed.call({ isNot: true }, el, {}, { wait: 1 })
118-
const received = getReceived(result.message())
119117

120-
expect(received).toContain('not')
118+
expect(result.message()).toContain('not')
121119
expect(result.pass).toBe(false)
122120
})
123121

‎test/matchers/element/toHaveComputedLabel.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ describe('toHaveComputedLabel', () => {
9191
return 'WebdriverIO'
9292
}
9393
const result = await toHaveComputedLabel.call({ isNot: true }, el, 'WebdriverIO', { wait: 0 })
94-
// const received = getReceived(result.message())
9594

96-
// TODO dprevost to fix
97-
// expect(received).toContain('not')
95+
expect(result.message()).toContain('not')
9896
expect(result.pass).toBe(false)
9997
})
10098

‎test/matchers/element/toHaveComputedRole.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ describe('toHaveComputedcomputed role', () => {
9191
return 'WebdriverIO'
9292
}
9393
const result = await toHaveComputedRole.call({ isNot: true }, el, 'WebdriverIO', { wait: 0 })
94-
// const received = getReceived(result.message())
9594

96-
// TODO dprevost to fix
97-
// expect(received).toContain('not')
95+
expect(result.message()).toContain('not')
9896
expect(result.pass).toBe(false)
9997
})
10098

‎test/matchers/element/toHaveHTML.test.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ describe('toHaveHTML', () => {
9191
return '<div>foo</div>'
9292
}
9393
const result = await toHaveHTML.call({ isNot: true }, el, '<div>foo</div>', { wait: 0 })
94-
const received = getReceived(result.message())
9594

96-
expect(received).not.toContain('not')
95+
expect(result.message()).toContain('not')
9796
expect(result.pass).toBe(false)
9897
})
9998

@@ -103,9 +102,7 @@ describe('toHaveHTML', () => {
103102
return '<div>foo</div>'
104103
}
105104
const result = await toHaveHTML.call({ isNot: true }, el, '<div>Notfoo</div>', { wait: 0 })
106-
const received = getReceived(result.message())
107105

108-
expect(received).not.toContain('not')
109106
expect(result.pass).toBe(true)
110107
})
111108

‎test/matchers/element/toHaveHeight.test.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
33

4-
import { getExpectMessage, getReceived } from '../../__fixtures__/utils.js'
4+
import { getExpectMessage } from '../../__fixtures__/utils.js'
55
import { toHaveHeight } from '../../../src/matchers/element/toHaveHeight.js'
66

77
vi.mock('@wdio/globals')
@@ -142,11 +142,10 @@ describe('toHaveHeight', () => {
142142
}
143143
return { width: 50, height: 32 }
144144
}
145-
const result = await toHaveHeight.call({}, el, 32, { wait: 0 })
146-
const received = getReceived(result.message())
145+
const result = await toHaveHeight.call({ isNot: true }, el, 32, { wait: 0 })
147146

148-
expect(received).not.toContain('not')
149-
expect(result.pass).toBe(true)
147+
expect(result.message()).toContain('not')
148+
expect(result.pass).toBe(false)
150149
})
151150

152151
test("should return false if sizes don't match", async () => {

‎test/matchers/element/toHaveSize.test.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
33

4-
import { getExpectMessage, getReceived } from '../../__fixtures__/utils.js'
4+
import { getExpectMessage } from '../../__fixtures__/utils.js'
55
import { toHaveSize } from '../../../src/matchers/element/toHaveSize.js'
66

77
vi.mock('@wdio/globals')
@@ -90,11 +90,10 @@ describe('toHaveSize', () => {
9090
el._size = function () {
9191
return { width: 32, height: 32 }
9292
}
93-
const result = await toHaveSize.call({}, el, { width: 32, height: 32 }, { wait: 0 })
94-
const received = getReceived(result.message())
93+
const result = await toHaveSize.call({ isNot: true }, el, { width: 32, height: 32 }, { wait: 0 })
9594

96-
expect(received).not.toContain('not')
97-
expect(result.pass).toBe(true)
95+
expect(result.message()).toContain('not')
96+
expect(result.pass).toBe(false)
9897
})
9998

10099
test("should return false if sizes don't match", async () => {

‎test/matchers/element/toHaveStyle.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, test, describe, expect } from 'vitest'
22
import { $ } from '@wdio/globals'
33

4-
import { getExpectMessage, getReceived } from '../../__fixtures__/utils.js'
4+
import { getExpectMessage } from '../../__fixtures__/utils.js'
55
import { toHaveStyle } from '../../../src/matchers/element/toHaveStyle.js'
66

77
vi.mock('@wdio/globals')
@@ -122,9 +122,8 @@ describe('toHaveStyle', () => {
122122
return { value: mockStyle[property] }
123123
})
124124
const result = await toHaveStyle.call({ isNot: true }, el, mockStyle, { wait: 0 })
125-
const received = getReceived(result.message())
126125

127-
expect(received).not.toContain('not')
126+
expect(result.message()).toContain('not')
128127
expect(result.pass).toBe(false)
129128
})
130129

‎test/matchers/element/toHaveText.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@ describe('toHaveText', () => {
129129
return 'WebdriverIO'
130130
}
131131
const result = await toHaveText.call({ isNot: true }, el, 'WebdriverIO', { wait: 0 })
132-
const received = getReceived(result.message())
133132

134-
expect(received).not.toContain('not')
133+
expect(result.message()).toContain('not')
135134
expect(result.pass).toBe(false)
136135
})
137136

0 commit comments

Comments
 (0)