Remove deprecated arg style syntax and update tests to mantain coverage

Author: mjrussell

package.json

@@ -52,7 +52,6 @@
   },
   "dependencies": {
     "hoist-non-react-statics": "1.0.5",
-    "lodash.isempty": "4.1.1",
-    "warning": "2.1.0"
+    "lodash.isempty": "4.1.1"
   }
 }

src/index.js

@@ -2,7 +2,6 @@ import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import hoistStatics from 'hoist-non-react-statics'
 import isEmpty from 'lodash.isempty'
-import warning from 'warning'
 
 const defaults = {
   failureRedirectPath: '/login',
@@ -11,7 +10,7 @@ const defaults = {
   allowRedirectBack: true
 }
 
-const UserAuthWrapper = (args) => {
+export const UserAuthWrapper = (args) => {
   const { authSelector, failureRedirectPath, wrapperDisplayName, predicate, allowRedirectBack, redirectAction } = {
     ...defaults,
     ...args
@@ -114,27 +113,3 @@ const UserAuthWrapper = (args) => {
 
   return wrapComponent
 }
-
-// Support the old 0.1.x with deprecation warning
-const DeprecatedWrapper = authSelector =>
-  (failureRedirectPath, wrapperDisplayName, predicate = x => !isEmpty(x), allowRedirectBack = true) => {
-    warning(false, `Deprecated arg style syntax found for auth wrapper named ${wrapperDisplayName}. Pass a config object instead`)
-    return UserAuthWrapper({
-      ...defaults,
-      authSelector,
-      failureRedirectPath,
-      wrapperDisplayName,
-      predicate,
-      allowRedirectBack
-    })
-  }
-
-const BackwardsCompatWrapper = (arg) => {
-  if (typeof arg === 'function') {
-    return DeprecatedWrapper(arg)
-  } else {
-    return UserAuthWrapper(arg)
-  }
-}
-
-module.exports.UserAuthWrapper = BackwardsCompatWrapper

test/UserAuthWrapper-test.js

@@ -62,8 +62,13 @@ const UserIsOnlyTest = UserAuthWrapper({
   predicate: user => user.firstName === 'Test'
 })
 
-// Intential deprecated version
-const UserIsOnlyMcDuderson = UserAuthWrapper(userSelector)('/', 'UserIsOnlyMcDuderson', user => user.lastName === 'McDuderson')
+const UserIsOnlyMcDuderson = UserAuthWrapper({
+  authSelector: userSelector,
+  redirectAction: routeActions.replace,
+  failureRedirectPath: '/',
+  wrapperDisplayName: 'UserIsOnlyMcDuderson',
+  predicate: user => user.lastName === 'McDuderson'
+})
 
 class App extends Component {
   static propTypes = {
@@ -362,4 +367,28 @@ describe('UserAuthWrapper', () => {
     expect(store.getState().routing.location.pathname).to.equal('/login')
     expect(store.getState().routing.location.search).to.equal('?redirect=%2FownProps%2F2')
   })
+
+  it('uses router for redirect if no redirectAction specified', () => {
+
+    const UserIsAuthenticatedNoAction = UserAuthWrapper({
+      authSelector: userSelector,
+      wrapperDisplayName: 'UserIsAuthenticatedRouter'
+    })
+
+    const routes = (
+      <Route path="/" component={App} >
+        <Route path="login" component={UnprotectedComponent} />
+        <Route path="noaction" component={UserIsAuthenticatedNoAction(UnprotectedComponent)} />
+      </Route>
+    )
+
+    const { history, store } = setupTest(routes)
+
+    expect(store.getState().routing.location.pathname).to.equal('/')
+    expect(store.getState().routing.location.search).to.equal('')
+
+    history.push('/noaction')
+    expect(store.getState().routing.location.pathname).to.equal('/login')
+    expect(store.getState().routing.location.search).to.equal('?redirect=%2Fnoaction')
+  })
 })