Merge pull request #2138 from unh/master

Add isActive test with a custom parse/stringify function

Author: mjackson

modules/__tests__/isActive-test.js

@@ -5,6 +5,7 @@ import createHistory from 'history/lib/createMemoryHistory'
 import IndexRoute from '../IndexRoute'
 import Router from '../Router'
 import Route from '../Route'
+import qs from 'qs'
 
 describe('isActive', function () {
 
@@ -200,4 +201,61 @@ describe('isActive', function () {
     })
   })
 
+  describe('a pathname that matches URL', function () {
+    describe('with query that does match', function () {
+      it('is active', function (done) {
+        React.render((
+          <Router history={createHistory('/home?foo[]=bar&foo[]=bar1&foo[]=bar2')}>
+            <Route path="/" />
+            <Route path="/home" />
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/home', { foo: [ 'bar', 'bar1', 'bar2' ] })).toBe(true)
+          done()
+        })
+      })
+    })
+
+    describe('with a custom parse function and a query that does not match', function () {
+      it('is not active', function (done) {
+        function stringifyQuery(params) {
+            return qs.stringify(params, { arrayFormat: 'indices' })
+        }
+        function parseQueryString(query) {
+            return qs.parse(query, { parseArrays: false })
+        }
+
+        React.render((
+          <Router history={createHistory('/home?foo[1]=bar')} stringifyQuery={stringifyQuery} parseQueryString={parseQueryString}>
+            <Route path="/" />
+            <Route path="/home" />
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/home', { foo: { 4: 'bar' } })).toBe(false)
+          done()
+        })
+      })
+    })
+
+    describe('with a custom parse function and a query that match', function () {
+      it('is active', function (done) {
+        function stringifyQuery(params) {
+            return qs.stringify(params, { arrayFormat: 'indices' })
+        }
+        function parseQueryString(query) {
+            return qs.parse(query, { parseArrays: false })
+        }
+
+        React.render((
+          <Router history={createHistory('/home?foo[4]=bar&foo[1]=bar2')} stringifyQuery={stringifyQuery} parseQueryString={parseQueryString}>
+            <Route path="/" />
+            <Route path="/home" />
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/home', { foo: { 1: 'bar2', 4: 'bar' } })).toBe(true)
+          done()
+        })
+      })
+    })
+  })
 })

modules/isActive.js

@@ -1,5 +1,5 @@
 import { matchPattern } from './PatternUtils'
-
+import deepEqual from 'deep-equal'
 /**
  * Returns true if the given pathname matches the active pathname.
  */
@@ -64,11 +64,7 @@ function queryIsActive(query, activeQuery) {
   if (query == null)
     return true
 
-  for (const p in query)
-    if (query.hasOwnProperty(p) && String(query[p]) !== String(activeQuery[p]))
-      return false
-
-  return true
+  return deepEqual(query, activeQuery)
 }
 
 /**

package.json

@@ -25,6 +25,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "deep-equal": "^1.0.0",
     "history": "1.12.1",
     "invariant": "^2.0.0",
     "warning": "^2.0.0"
@@ -51,6 +52,7 @@
     "karma-sourcemap-loader": "^0.3.5",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.0.1",
+    "qs": "^4.0.0",
     "react": "0.13.x",
     "rf-changelog": "^0.4.0",
     "style-loader": "^0.12.4",