Merge pull request #2702 from rackt/1.0.3-maybe

Switch back to a caret range for history

Author: taion

.travis.yml

@@ -11,3 +11,4 @@ after_success:
 branches:
   only:
   - master
+  - 1.0.x

modules/__tests__/Link-test.js

@@ -289,15 +289,21 @@ describe('A <Link>', function () {
       }
 
       const history = createHistory('/')
-      const spy = spyOn(history, 'pushState').andCallThrough()
+      const spy = spyOn(history, 'push').andCallThrough()
 
       const steps = [
         function () {
           click(node.querySelector('a'), { button: 0 })
         },
         function () {
           expect(node.innerHTML).toMatch(/Hello/)
-          expect(spy).toHaveBeenCalledWith({ you: 'doing?' }, { pathname: '/hello', search: '?how=are', hash: '#world' })
+          expect(spy).toHaveBeenCalled()
+
+          const { location } = this.state
+          expect(location.pathname).toEqual('/hello')
+          expect(location.search).toEqual('?how=are')
+          expect(location.hash).toEqual('#world')
+          expect(location.state).toEqual({ you: 'doing?' })
         }
       ]
 

modules/__tests__/isActive-test.js

@@ -390,7 +390,7 @@ describe('isActive', function () {
     describe('with query that does match', function () {
       it('is active', function (done) {
         render((
-          <Router history={createHistory('/home?foo[]=bar&foo[]=bar1&foo[]=bar2')}>
+          <Router history={createHistory('/home?foo=bar&foo=bar1&foo=bar2')}>
             <Route path="/" />
             <Route path="/home" />
           </Router>

package.json

@@ -41,7 +41,7 @@
     "warning": "^2.0.0"
   },
   "peerDependencies": {
-    "history": "1.13.x"
+    "history": "^1.16.0"
   },
   "devDependencies": {
     "babel": "^5.4.7",