Adding default trim for toHaveText and toHaveTextContaining (#398)

* Adding default trim for toHaveText and toHaveTextContaining * Adding trim as false for test -> 'not - failure (with wait)'
webdriverio · May 14, 2021 · 7992ffe · 7992ffe
1 parent 5373914
commit 7992ffe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -91,7 +91,7 @@ const compareNumbers = (actual: number, gte: number, lte: number, eq?: number):
     return actual >= gte
 }
 
-export const compareText = (actual: string, expected: string, { ignoreCase = false, trim = false, containing = false }) => {
+export const compareText = (actual: string, expected: string, { ignoreCase = false, trim = true, containing = false }) => {
     if (typeof actual !== 'string') {
         return {
             value: actual,

diff --git a/test/matchers/browserMatchers.test.ts b/test/matchers/browserMatchers.test.ts
@@ -21,7 +21,7 @@ describe('browser matchers', () => {
                     return validText
                 }
 
-                const result = await fn.call({}, browser, validText)
+                const result = await fn.call({}, browser, validText, { trim: false })
                 expect(result.pass).toBe(true)
                 expect(browser._attempts).toBe(0)
             })
@@ -31,7 +31,7 @@ describe('browser matchers', () => {
                     throw new Error('some error')
                 }
 
-                const result = await fn.call({}, browser, validText)
+                const result = await fn.call({}, browser, validText, { trim: false })
                 expect(result.pass).toBe(false)
             })
 
@@ -42,7 +42,7 @@ describe('browser matchers', () => {
                     return validText
                 }
 
-                const result = await fn.call({}, browser, validText)
+                const result = await fn.call({}, browser, validText, { trim: false })
                 expect(result.pass).toBe(true)
                 expect(browser._attempts).toBe(1)
             })
@@ -54,7 +54,7 @@ describe('browser matchers', () => {
                     return wrongText
                 }
 
-                const result = await fn.call({}, browser, validText, { wait: 0 })
+                const result = await fn.call({}, browser, validText, { wait: 0, trim: false })
                 expect(result.pass).toBe(false)
                 expect(browser._attempts).toBe(1)
             })
@@ -66,14 +66,14 @@ describe('browser matchers', () => {
                     return validText
                 }
 
-                const result = await fn.call({}, browser, validText, { wait: 0 })
+                const result = await fn.call({}, browser, validText, { wait: 0, trim: false })
 
                 expect(result.pass).toBe(true)
                 expect(browser._attempts).toBe(1)
             })
 
             test('not - failure', async () => {
-                const result = await fn.call({ isNot: true }, browser, validText, { wait: 0 })
+                const result = await fn.call({ isNot: true }, browser, validText, { wait: 0, trim: false })
 
                 expect(getExpectMessage(result.message())).toContain('not')
                 expect(getExpected(result.message())).toContain('not')
@@ -95,7 +95,7 @@ describe('browser matchers', () => {
             })
 
             test('not - failure (with wait)', async () => {
-                const result = await fn.call({ isNot: true }, browser, validText, { wait: 1 })
+                const result = await fn.call({ isNot: true }, browser, validText, { wait: 1, trim: false })
 
                 expect(getExpectMessage(result.message())).toContain('not')
                 expect(getExpected(result.message())).toContain('not')

diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -11,11 +11,15 @@ describe('utils', () => {
         })
 
         test('trim', () => {
-            expect(compareText(' foo ', 'foo', { trim: true }).result).toBe(true)
+            expect(compareText(' foo ', 'foo', {}).result).toBe(true)
+        })
+
+        test('without trim', () => {
+            expect(compareText(' foo ', 'foo ', { trim: false }).result).toBe(false)
         })
 
         test('ignoreCase', () => {
-            expect(compareText(' FOO ', 'foo', { trim: true, ignoreCase: true }).result).toBe(true)
+            expect(compareText(' FOO ', 'foo', { ignoreCase: true }).result).toBe(true)
         })
 
         test('containing', () => {