Fixing runTest script and travis

mjrussell · Mar 27, 2017 · 53c29ad · 53c29ad
1 parent 0aa77df
commit 53c29ad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,6 @@ env:
   - REACT_ROUTER_VERSION=4
 script:
   - npm run lint
-  - runTests.sh
+  - ./runTests.sh
 after_success:
 - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
diff --git a/runTests.sh b/runTests.sh
@@ -6,11 +6,9 @@ rm -rf node_modules/history
 if [ "$REACT_ROUTER_VERSION" = "3" ]; then
   npm install react-router@3.0.2
   npm install react-router-redux@4.0.8
-  # npm run test:cov -- test/rrv3-test.js
-  npm run test -- test/rrv3-test.js
+  npm run test:cov -- test/rrv3-test.js
 elif [ "$REACT_ROUTER_VERSION" = "4" ]; then
   npm install react-router@4.0.0
   npm install history@4.6.1
-  # npm run test:cov -- test/rrv4-test.js
-  npm run test -- test/rrv4-test.js
+  npm run test:cov -- test/rrv4-test.js
 fi
diff --git a/src/index.js b/src/index.js
@@ -121,6 +121,8 @@ export const UserAuthWrapper = (args) => {
       }
 
       getRedirectFunc = ({ redirect }) => {
+        // Its silly to test both RR4 and RR3 branches in one test suite, so ignore it
+        /* istanbul ignore else sanity */
         if (redirect) {
           return redirect
         } else if (this.context.router) {

diff --git a/test/rrv3-test.js b/test/rrv3-test.js
@@ -193,5 +193,3 @@ describe('UserAuthWrapper React Router V3 Additions', () => {
     expect(getLocation().search).to.equal('?redirect=%2Fauth')
   })
 })
-
-// TODO add redirectAction test