Update expect dep and remove assert dep

Author: mjackson

modules/__tests__/Link-test.js

@@ -1,6 +1,5 @@
 /*eslint-env mocha */
 /*eslint react/prop-types: 0*/
-import assert from 'assert'
 import expect from 'expect'
 import React from 'react'
 import ReactTestUtils from 'react-addons-test-utils'
@@ -267,11 +266,10 @@ describe('A <Link>', function () {
       class LinkWrapper extends React.Component {
         handleClick(event) {
           event.preventDefault()
-          assert.ok(true)
           done()
         }
         render() {
-          return <Link to="/hello" onClick={(e) => this.handleClick(e)}>Link</Link>
+          return <Link to="/hello" onClick={e => this.handleClick(e)}>Link</Link>
         }
       }
 

modules/__tests__/RouteComponent-test.js

@@ -19,7 +19,8 @@ describe('a Route Component', function () {
   it('injects the right props', function (done) {
     class Parent extends React.Component {
       componentDidMount() {
-        assertProps(this.props)
+        expect(this.props.route).toEqual(parent)
+        expect(this.props.routes).toEqual([ parent, child ])
       }
       render() {
         return null
@@ -35,11 +36,6 @@ describe('a Route Component', function () {
     const child = { path: 'child', component: Child }
     const parent = { path: '/', component: Parent, childRoutes: [ child ] }
 
-    function assertProps(props) {
-      expect(props.route).toEqual(parent)
-      expect(props.routes).toEqual([ parent, child ])
-    }
-
     render((
       <Router history={createHistory('/child')} routes={parent}/>
     ), node, done)

modules/__tests__/matchRoutes-test.js

@@ -1,12 +1,10 @@
 /*eslint-env mocha */
-import React from 'react'
-import Route from '../Route'
-
-import assert from 'assert'
 import expect from 'expect'
+import React from 'react'
 import { createMemoryHistory } from 'history'
 import { createRoutes } from '../RouteUtils'
 import matchRoutes from '../matchRoutes'
+import Route from '../Route'
 
 describe('matchRoutes', function () {
 
@@ -67,7 +65,7 @@ describe('matchRoutes', function () {
     describe('when the location matches an index route', function () {
       it('matches the correct routes', function (done) {
         matchRoutes(routes, createLocation('/users'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UsersIndexRoute ])
           done()
         })
@@ -77,7 +75,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a nested route with params', function () {
       it('matches the correct routes and params', function (done) {
         matchRoutes(routes, createLocation('/users/5'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UserRoute ])
           expect(match.params).toEqual({ userID: '5' })
           done()
@@ -88,7 +86,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a deeply nested route with params', function () {
       it('matches the correct routes and params', function (done) {
         matchRoutes(routes, createLocation('/users/5/abc'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UserRoute, PostRoute ])
           expect(match.params).toEqual({ userID: '5', postID: 'abc' })
           done()
@@ -99,7 +97,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a nested route with multiple splat params', function () {
       it('matches the correct routes and params', function (done) {
         matchRoutes(routes, createLocation('/files/a/b/c.jpg'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ FilesRoute ])
           expect(match.params).toEqual({ splat: [ 'a', 'b/c' ] })
           done()
@@ -110,7 +108,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a route with hash', function () {
       it('matches the correct routes', function (done) {
         matchRoutes(routes, createLocation('/users#about'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UsersIndexRoute ])
           done()
         })
@@ -120,7 +118,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a deeply nested route with params and hash', function () {
       it('matches the correct routes and params', function (done) {
         matchRoutes(routes, createLocation('/users/5/abc#about'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UserRoute, PostRoute ])
           expect(match.params).toEqual({ userID: '5', postID: 'abc' })
           done()
@@ -131,7 +129,7 @@ describe('matchRoutes', function () {
     describe('when the location matches an absolute route', function () {
       it('matches the correct routes', function (done) {
         matchRoutes(routes, createLocation('/about'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ AboutRoute ])
           done()
         })
@@ -141,7 +139,7 @@ describe('matchRoutes', function () {
     describe('when the location does not match any routes', function () {
       it('matches the "catch-all" route', function (done) {
         matchRoutes(routes, createLocation('/not-found'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ CatchAllRoute ])
           done()
         })
@@ -155,7 +153,7 @@ describe('matchRoutes', function () {
     describe('when the location matches a nested absolute route', function () {
       it('matches the correct routes', function (done) {
         matchRoutes(routes, createLocation('/team'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, TeamRoute ])
           done()
         })
@@ -165,7 +163,7 @@ describe('matchRoutes', function () {
     describe('when the location matches an absolute route nested under a route with params', function () {
       it('matches the correct routes and params', function (done) {
         matchRoutes(routes, createLocation('/profile'), function (error, match) {
-          assert(match)
+          expect(match).toExist()
           expect(match.routes).toEqual([ RootRoute, UsersRoute, UserRoute, ProfileRoute ])
           expect(match.params).toEqual({}) // no userID param
           done()
@@ -236,7 +234,7 @@ describe('matchRoutes', function () {
 
     it('when getChildRoutes callback returns reactElements', function (done) {
       matchRoutes(jsxRoutes, createLocation('/users/5'), function (error, match) {
-         assert(match)
+         expect(match).toExist()
          expect(match.routes.map(r => r.path)).toEqual([ 'users', ':userID' ])
          expect(match.params).toEqual({ userID: '5' })
          done()
@@ -245,7 +243,7 @@ describe('matchRoutes', function () {
 
     it('when getIndexRoute callback returns reactElements', function (done) {
       matchRoutes(jsxRoutes, createLocation('/users'), function (error, match) {
-         assert(match)
+         expect(match).toExist()
          expect(match.routes.map(r => r.name)).toEqual([ 'users', 'jsx' ])
          done()
       })

package.json

@@ -29,7 +29,6 @@
     "warning": "^2.0.0"
   },
   "devDependencies": {
-    "assert": "1.3.0",
     "babel": "^5.4.7",
     "babel-core": "^5.4.7",
     "babel-eslint": "^3.1.23",
@@ -38,7 +37,7 @@
     "css-loader": "^0.19.0",
     "eslint": "1.4.0",
     "eslint-plugin-react": "3.3.2",
-    "expect": "1.10.0",
+    "expect": "^1.12.0",
     "express": "^4.13.3",
     "express-urlrewrite": "^1.2.0",
     "karma": "^0.13.8",