Use jest-matchers for assertions instead of expect

remix-run · Jul 19, 2017 · e97509b · e97509b
1 parent 8d98aec
commit e97509b
Show file tree

Hide file tree

Showing 36 changed files with 197 additions and 245 deletions.
diff --git a/modules/__tests__/BrowserHistory-test.js b/modules/__tests__/BrowserHistory-test.js
@@ -1,4 +1,4 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import createHistory from '../createBrowserHistory'
 import { canUseDOM, supportsHistory } from '../DOMUtils'
 import * as TestSequences from './TestSequences'

diff --git a/modules/__tests__/HashHistory-test.js b/modules/__tests__/HashHistory-test.js
@@ -1,4 +1,4 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import createHistory from '../createHashHistory'
 import { canUseDOM, supportsGoWithoutReloadUsingHash } from '../DOMUtils'
 import * as TestSequences from './TestSequences'

diff --git a/modules/__tests__/LocationUtils-test.js b/modules/__tests__/LocationUtils-test.js
@@ -1,11 +1,11 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import { createLocation } from '../LocationUtils'
 
 describe('createLocation', () => {
   describe('with a full path', () => {
     describe('given as a string', () => {
       it('has the correct properties', () => {
-        expect(createLocation('/the/path?the=query#the-hash')).toMatch({
+        expect(createLocation('/the/path?the=query#the-hash')).toMatchObject({
           pathname: '/the/path',
           search: '?the=query',
           hash: '#the-hash'
@@ -15,7 +15,7 @@ describe('createLocation', () => {
 
     describe('given as an object', () => {
       it('has the correct properties', () => {
-        expect(createLocation({ pathname: '/the/path', search: '?the=query', hash: '#the-hash' })).toMatch({
+        expect(createLocation({ pathname: '/the/path', search: '?the=query', hash: '#the-hash' })).toMatchObject({
           pathname: '/the/path',
           search: '?the=query',
           hash: '#the-hash'
@@ -27,7 +27,7 @@ describe('createLocation', () => {
   describe('with a relative path', () => {
     describe('given as a string', () => {
       it('has the correct properties', () => {
-        expect(createLocation('the/path?the=query#the-hash')).toMatch({
+        expect(createLocation('the/path?the=query#the-hash')).toMatchObject({
           pathname: 'the/path',
           search: '?the=query',
           hash: '#the-hash'
@@ -37,7 +37,7 @@ describe('createLocation', () => {
 
     describe('given as an object', () => {
       it('has the correct properties', () => {
-        expect(createLocation({ pathname: 'the/path', search: '?the=query', hash: '#the-hash' })).toMatch({
+        expect(createLocation({ pathname: 'the/path', search: '?the=query', hash: '#the-hash' })).toMatchObject({
           pathname: 'the/path',
           search: '?the=query',
           hash: '#the-hash'
@@ -49,7 +49,7 @@ describe('createLocation', () => {
   describe('with a path with no pathname', () => {
     describe('given as a string', () => {
       it('has the correct properties', () => {
-        expect(createLocation('?the=query#the-hash')).toMatch({
+        expect(createLocation('?the=query#the-hash')).toMatchObject({
           pathname: '/',
           search: '?the=query',
           hash: '#the-hash'
@@ -59,7 +59,7 @@ describe('createLocation', () => {
 
     describe('given as an object', () => {
       it('has the correct properties', () => {
-        expect(createLocation({ search: '?the=query', hash: '#the-hash' })).toMatch({
+        expect(createLocation({ search: '?the=query', hash: '#the-hash' })).toMatchObject({
           pathname: '/',
           search: '?the=query',
           hash: '#the-hash'
@@ -71,7 +71,7 @@ describe('createLocation', () => {
   describe('with a path with no search', () => {
     describe('given as a string', () => {
       it('has the correct properties', () => {
-        expect(createLocation('/the/path#the-hash')).toMatch({
+        expect(createLocation('/the/path#the-hash')).toMatchObject({
           pathname: '/the/path',
           search: '',
           hash: '#the-hash'
@@ -81,7 +81,7 @@ describe('createLocation', () => {
 
     describe('given as an object', () => {
       it('has the correct properties', () => {
-        expect(createLocation({ pathname: '/the/path', hash: '#the-hash' })).toMatch({
+        expect(createLocation({ pathname: '/the/path', hash: '#the-hash' })).toMatchObject({
           pathname: '/the/path',
           search: '',
           hash: '#the-hash'
@@ -93,7 +93,7 @@ describe('createLocation', () => {
   describe('with a path with no hash', () => {
     describe('given as a string', () => {
       it('has the correct properties', () => {
-        expect(createLocation('/the/path?the=query')).toMatch({
+        expect(createLocation('/the/path?the=query')).toMatchObject({
           pathname: '/the/path',
           search: '?the=query',
           hash: ''
@@ -103,7 +103,7 @@ describe('createLocation', () => {
 
     describe('given as an object', () => {
       it('has the correct properties', () => {
-        expect(createLocation({ pathname: '/the/path', search: '?the=query' })).toMatch({
+        expect(createLocation({ pathname: '/the/path', search: '?the=query' })).toMatchObject({
           pathname: '/the/path',
           search: '?the=query',
           hash: ''
@@ -134,12 +134,12 @@ describe('createLocation', () => {
   describe('key', () => {
     it('has a key property if a key is provided', () => {
       const location = createLocation('/the/path', undefined, 'key')
-      expect(location).toIncludeKey('key')
+      expect(Object.keys(location)).toContain('key')
     })
 
     it('has no key property if no key is provided', () => {
       const location = createLocation('/the/path')
-      expect(location).toExcludeKey('key')
+      expect(Object.keys(location)).not.toContain('key')
     })
   })
 })
diff --git a/modules/__tests__/TestSequences/BackButtonTransitionHook.js b/modules/__tests__/TestSequences/BackButtonTransitionHook.js
@@ -1,19 +1,19 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   let unblock, hookWasCalled = false
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.push('/home')
     },
     (location, action) => {
       expect(action).toBe('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 
@@ -25,7 +25,7 @@ export default (history, done) => {
     },
     (location, action) => {
       expect(action).toBe('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 

diff --git a/modules/__tests__/TestSequences/BlockEverything.js b/modules/__tests__/TestSequences/BlockEverything.js
@@ -1,18 +1,18 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       const unblock = history.block()
 
       history.push('/home')
 
-      expect(history.location).toMatch({
+      expect(history.location).toMatchObject({
         pathname: '/'
       })
 

diff --git a/modules/__tests__/TestSequences/BlockPopWithoutListening.js b/modules/__tests__/TestSequences/BlockPopWithoutListening.js
@@ -1,7 +1,7 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 
 export default (history, done) => {
-  expect(history.location).toMatch({
+  expect(history.location).toMatchObject({
     pathname: '/'
   })
 

diff --git a/modules/__tests__/TestSequences/DenyGoBack.js b/modules/__tests__/TestSequences/DenyGoBack.js
@@ -1,24 +1,24 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   let unblock
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.push('/home')
     },
     (location, action) => {
       expect(action).toBe('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 
       unblock = history.block(nextLocation => {
-        expect(nextLocation).toMatch({
+        expect(nextLocation).toMatchObject({
           pathname: '/'
         })
 
@@ -29,7 +29,7 @@ export default (history, done) => {
     },
     (location, action) => {
       expect(action).toBe('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 

diff --git a/modules/__tests__/TestSequences/DenyGoForward.js b/modules/__tests__/TestSequences/DenyGoForward.js
@@ -1,32 +1,32 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   let unblock
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.push('/home')
     },
     (location, action) => {
       expect(action).toBe('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 
       history.goBack()
     },
     (location, action) => {
       expect(action).toBe('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       unblock = history.block(nextLocation => {
-        expect(nextLocation).toMatch({
+        expect(nextLocation).toMatchObject({
           pathname: '/home'
         })
 
@@ -37,7 +37,7 @@ export default (history, done) => {
     },
     (location, action) => {
       expect(action).toBe('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 

diff --git a/modules/__tests__/TestSequences/DenyPush.js b/modules/__tests__/TestSequences/DenyPush.js
@@ -1,15 +1,15 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       const unblock = history.block(nextLocation => {
-        expect(nextLocation).toMatch({
+        expect(nextLocation).toMatchObject({
           pathname: '/home'
         })
 
@@ -18,7 +18,7 @@ export default (history, done) => {
 
       history.push('/home')
 
-      expect(history.location).toMatch({
+      expect(history.location).toMatchObject({
         pathname: '/'
       })
 

diff --git a/modules/__tests__/TestSequences/GoBack.js b/modules/__tests__/TestSequences/GoBack.js
@@ -1,26 +1,26 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.push('/home')
     },
     (location, action) => {
       expect(action).toEqual('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 
       history.goBack()
     },
     (location, action) => {
       expect(action).toEqual('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
     }

diff --git a/modules/__tests__/TestSequences/GoForward.js b/modules/__tests__/TestSequences/GoForward.js
@@ -1,34 +1,34 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.push('/home')
     },
     (location, action) => {
       expect(action).toEqual('PUSH')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
 
       history.goBack()
     },
     (location, action) => {
       expect(action).toEqual('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
       history.goForward()
     },
     (location, action) => {
       expect(action).toEqual('POP')
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/home'
       })
     }

diff --git a/modules/__tests__/TestSequences/HashChangeTransitionHook.js b/modules/__tests__/TestSequences/HashChangeTransitionHook.js
@@ -1,11 +1,11 @@
-import expect from 'expect'
+import expect from 'jest-matchers'
 import execSteps from './execSteps'
 
 export default (history, done) => {
   let unblock, hookWasCalled = false
   const steps = [
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/'
       })
 
@@ -16,7 +16,7 @@ export default (history, done) => {
       window.location.hash = 'something-new'
     },
     (location) => {
-      expect(location).toMatch({
+      expect(location).toMatchObject({
         pathname: '/',
         hash: '#something-new'
       })