Assert on specific warnings in tests

Author: taion

.travis.yml

@@ -2,9 +2,6 @@ sudo: false
 language: node_js
 node_js:
 - stable
-env:
--
-- SKIP_BC=1 FAIL_ON_WARNINGS=1
 cache:
   directories:
   - node_modules

karma.conf.js

@@ -106,9 +106,7 @@ module.exports = function (config) {
       },
       plugins: [
         new webpack.DefinePlugin({
-          'process.env.NODE_ENV': JSON.stringify('test'),
-          'process.env.SKIP_BC': JSON.stringify(process.env.SKIP_BC || false),
-          'process.env.FAIL_ON_WARNINGS': JSON.stringify(process.env.FAIL_ON_WARNINGS || false)
+          'process.env.NODE_ENV': JSON.stringify('test')
         })
       ]
     },
@@ -157,19 +155,3 @@ module.exports = function (config) {
     }
   }
 }
-
-console.log()
-console.log('===')
-if (process.env.SKIP_BC) {
-  console.warn('`SKIP_BC=1` detected: skipping backwards compatibility tests')
-} else {
-  console.log('`SKIP_BC=1 npm run *` to skip backwards compatibility tests.')
-}
-
-if (process.env.FAIL_ON_WARNINGS) {
-  console.warn('`FAIL_ON_WARNINGS=1` detected: console.error will now fail tests.')
-} else {
-  console.log('`FAIL_ON_WARNINGS=1 npm run *` to cause console warnings to throw errors.')
-}
-console.log('===')
-console.log()

modules/__tests__/_bc-History-test.js

@@ -5,9 +5,8 @@ import History from '../History'
 import Router from '../Router'
 import Route from '../Route'
 import createHistory from 'history/lib/createMemoryHistory'
+import shouldWarn from './shouldWarn'
 
-// skipping to remove warnings, and we don't intent to update this mixin
-// keeping tests here just in-case
 describe('v1 History Mixin', function () {
 
   let node
@@ -19,7 +18,12 @@ describe('v1 History Mixin', function () {
     unmountComponentAtNode(node)
   })
 
+  beforeEach(function () {
+    shouldWarn('deprecated')
+  })
+
   it('assigns the history to the component instance', function (done) {
+
     const history = createHistory('/')
 
     const Component = React.createClass({

modules/__tests__/_bc-Link-test.js

@@ -7,6 +7,7 @@ import createHistory from 'history/lib/createMemoryHistory'
 import Router from '../Router'
 import Route from '../Route'
 import Link from '../Link'
+import shouldWarn from './shouldWarn'
 
 const { click } = Simulate
 
@@ -23,6 +24,10 @@ describe('v1 Link', function () {
     node = document.createElement('div')
   })
 
+  beforeEach(function () {
+    shouldWarn('deprecated')
+  })
+
   it('knows how to make its href', function () {
     class LinkWrapper extends Component {
       render() {

modules/__tests__/_bc-Router-test.js

@@ -4,9 +4,9 @@ import { render, unmountComponentAtNode } from 'react-dom'
 import createHistory from 'history/lib/createMemoryHistory'
 import Route from '../Route'
 import Router from '../Router'
+import shouldWarn from './shouldWarn'
 
 describe('v1 Router', function () {
-
   class Parent extends Component {
     render() {
       return <div>parent {this.props.children}</div>
@@ -28,6 +28,10 @@ describe('v1 Router', function () {
     unmountComponentAtNode(node)
   })
 
+  beforeEach(function () {
+    shouldWarn('deprecated')
+  })
+
   it('renders routes', function (done) {
     render((
       <Router history={createHistory('/')}>

modules/__tests__/_bc-isActive-test.js

@@ -6,6 +6,7 @@ import IndexRoute from '../IndexRoute'
 import Router from '../Router'
 import Route from '../Route'
 import qs from 'qs'
+import shouldWarn from './shouldWarn'
 
 describe('v1 isActive', function () {
 
@@ -18,6 +19,10 @@ describe('v1 isActive', function () {
     unmountComponentAtNode(node)
   })
 
+  beforeEach(function () {
+    shouldWarn('deprecated')
+  })
+
   describe('a pathname that matches the URL', function () {
     describe('with no query', function () {
       it('is active', function (done) {

modules/__tests__/_bc-serverRendering-test.js

@@ -5,6 +5,7 @@ import { renderToString } from 'react-dom/server'
 import Link from '../Link'
 import match from '../match'
 import RoutingContext from '../RoutingContext'
+import shouldWarn from './shouldWarn'
 
 describe('v1 server rendering', function () {
 
@@ -67,6 +68,8 @@ describe('v1 server rendering', function () {
   }
 
   it('works', function (done) {
+    shouldWarn('has been renamed')
+
     match({ routes, location: '/dashboard' }, function (error, redirectLocation, renderProps) {
       const string = renderToString(
         <RoutingContext {...renderProps} />
@@ -77,6 +80,8 @@ describe('v1 server rendering', function () {
   })
 
   it('renders active Links as active', function (done) {
+    shouldWarn('has been renamed')
+
     match({ routes, location: '/about' }, function (error, redirectLocation, renderProps) {
       const string = renderToString(
         <RoutingContext {...renderProps} />
@@ -88,6 +93,8 @@ describe('v1 server rendering', function () {
   })
 
   it('sends the redirect location', function (done) {
+    shouldWarn('deprecated')
+
     match({ routes, location: '/company' }, function (error, redirectLocation) {
       expect(redirectLocation).toExist()
       expect(redirectLocation.pathname).toEqual('/about')

modules/__tests__/_bc-transitionHooks-test.js

@@ -2,9 +2,9 @@ import expect, { spyOn } from 'expect'
 import React, { Component } from 'react'
 import { render, unmountComponentAtNode } from 'react-dom'
 import createHistory from 'history/lib/createMemoryHistory'
-import useQueries from 'history/lib/useQueries'
 import execSteps from './execSteps'
 import Router from '../Router'
+import shouldWarn from './shouldWarn'
 
 describe('v1 When a router enters a branch', function () {
 
@@ -109,6 +109,10 @@ describe('v1 When a router enters a branch', function () {
     unmountComponentAtNode(node)
   })
 
+  beforeEach(function () {
+    shouldWarn('deprecated')
+  })
+
   it('calls the onEnter hooks of all routes in that branch', function (done) {
     const dashboardRouteEnterSpy = spyOn(DashboardRoute, 'onEnter').andCallThrough()
     const newsFeedRouteEnterSpy = spyOn(NewsFeedRoute, 'onEnter').andCallThrough()
@@ -196,7 +200,7 @@ describe('v1 When a router enters a branch', function () {
   describe('and then the query changes', function () {
     it('calls the onEnter hooks of all routes in that branch', function (done) {
       const newsFeedRouteEnterSpy = spyOn(NewsFeedRoute, 'onEnter').andCallThrough()
-      const history = useQueries(createHistory)('/inbox')
+      const history = createHistory('/inbox')
 
       render(<Router history={history} routes={routes}/>, node, function () {
         history.pushState(null, '/news', { q: 1 })

modules/__tests__/matchRoutes-test.js

@@ -5,6 +5,7 @@ import { createRoutes } from '../RouteUtils'
 import matchRoutes from '../matchRoutes'
 import Route from '../Route'
 import IndexRoute from '../IndexRoute'
+import shouldWarn from './shouldWarn'
 
 describe('matchRoutes', function () {
   let routes
@@ -331,33 +332,18 @@ describe('matchRoutes', function () {
     })
   })
 
-  describe('invalid route configs', function () {
-    let invalidRoutes, errorSpy
+  it('complains about invalid index route with path', function (done) {
+    shouldWarn('path')
 
-    beforeEach(function () {
-      errorSpy = expect.spyOn(console, 'error')
-    })
-
-    afterEach(function () {
-      errorSpy.restore()
-    })
-
-    describe('index route with path', function () {
-      beforeEach(function () {
-        invalidRoutes = createRoutes(
-          <Route path="/">
-            <IndexRoute path="foo" />
-          </Route>
-        )
-      })
+    const invalidRoutes = createRoutes(
+      <Route path="/">
+        <IndexRoute path="foo" />
+      </Route>
+    )
 
-      it('complains when matching', function (done) {
-        matchRoutes(invalidRoutes, createLocation('/'), function (error, match) {
-          expect(match).toExist()
-          expect(errorSpy).toHaveBeenCalledWith('Warning: [react-router] Index routes should not have paths')
-          done()
-        })
-      })
+    matchRoutes(invalidRoutes, createLocation('/'), function (error, match) {
+      expect(match).toExist()
+      done()
     })
   })
 })

modules/__tests__/shouldWarn.js

@@ -0,0 +1,5 @@
+/*eslint no-console: 0*/
+
+export default function shouldWarn(about) {
+  console.error.expected.push(about)
+}