Merge pull request #2224 from timdorr/test-link-hash

Fix the hash prop on Links

Author: timdorr

modules/Link.js

@@ -81,8 +81,14 @@ class Link extends Component {
 
     event.preventDefault()
 
-    if (allowTransition)
-      this.context.history.pushState(this.props.state, this.props.to, this.props.query)
+    if (allowTransition) {
+      let { state, to, query, hash } = this.props
+
+      if (hash)
+        to += hash
+
+      this.context.history.pushState(state, to, query)
+    }
   }
 
   render() {

modules/__tests__/Link-test.js

@@ -1,16 +1,16 @@
 /*eslint-env mocha */
 /*eslint react/prop-types: 0*/
-import expect from 'expect'
+import expect, { spyOn } from 'expect'
 import React, { Component } from 'react'
-import ReactTestUtils from 'react-addons-test-utils'
+import { Simulate } from 'react-addons-test-utils'
 import { render } from 'react-dom'
 import createHistory from 'history/lib/createMemoryHistory'
 import execSteps from './execSteps'
 import Router from '../Router'
 import Route from '../Route'
 import Link from '../Link'
 
-const { click } = ReactTestUtils.Simulate
+const { click } = Simulate
 
 describe('A <Link>', function () {
 
@@ -289,23 +289,27 @@ describe('A <Link>', function () {
           // just here to make sure click handlers don't prevent it from happening
         }
         render() {
-          return <Link to="/hello" onClick={(e) => this.handleClick(e)}>Link</Link>
+          return <Link to="/hello" hash="#world" onClick={(e) => this.handleClick(e)}>Link</Link>
         }
       }
 
+      const history = createHistory('/')
+      const spy = spyOn(history, 'pushState').andCallThrough()
+
       const steps = [
         function () {
           click(node.querySelector('a'), { button: 0 })
         },
         function () {
           expect(node.innerHTML).toMatch(/Hello/)
+          expect(spy).toHaveBeenCalledWith(undefined, '/hello#world')
         }
       ]
 
       const execNextStep = execSteps(steps, done)
 
       render((
-        <Router history={createHistory('/')} onUpdate={execNextStep}>
+        <Router history={history} onUpdate={execNextStep}>
           <Route path="/" component={LinkWrapper} />
           <Route path="/hello" component={Hello} />
         </Router>