Fix hash support

modules/__tests__/BrowserHistory-test.js

@@ -5,6 +5,7 @@ import describeInitialLocation from './describeInitialLocation'
 import describeTransitions from './describeTransitions'
 import describePushState from './describePushState'
 import describeReplaceState from './describeReplaceState'
+import describeHashSupport from './describeHashSupport'
 import describeBasename from './describeBasename'
 import describeQueries from './describeQueries'
 import describeGo from './describeGo'
@@ -19,6 +20,7 @@ describe('browser history', function () {
     describeTransitions(createBrowserHistory)
     describePushState(createBrowserHistory)
     describeReplaceState(createBrowserHistory)
+    describeHashSupport(createBrowserHistory)
     describeBasename(createBrowserHistory)
     describeQueries(createBrowserHistory)
     describeGo(createBrowserHistory)
@@ -28,6 +30,7 @@ describe('browser history', function () {
       describeTransitions(createBrowserHistory)
       describePushState(createBrowserHistory)
       describeReplaceState(createBrowserHistory)
+      describeHashSupport(createBrowserHistory)
       describeBasename(createBrowserHistory)
       describeQueries(createBrowserHistory)
       describeGo(createBrowserHistory)

modules/__tests__/HashHistory-test.js

@@ -25,7 +25,7 @@ function describeStatePersistence(createHistory) {
     })
 
     it('forgets state across transitions', function (done) {
-      let steps = [
+      const steps = [
         function (location) {
           expect(location.pathname).toEqual('/')
           expect(location.search).toEqual('')
@@ -74,7 +74,7 @@ function describeStatePersistence(createHistory) {
     })
 
     it('remembers state across transitions', function (done) {
-      let steps = [
+      const steps = [
         function (location) {
           expect(location.pathname).toEqual('/')
           expect(location.search).toEqual('')

modules/__tests__/describeHashSupport.js

@@ -0,0 +1,43 @@
+/*eslint-env mocha */
+import expect from 'expect'
+import { PUSH, POP } from '../Actions'
+import execSteps from './execSteps'
+
+function describeHashSupport(createHistory) {
+  describe('when a URL with a hash is pushed', function () {
+    let history, unlisten
+    beforeEach(function () {
+      history = createHistory()
+    })
+
+    afterEach(function () {
+      if (unlisten)
+        unlisten()
+    })
+
+    it('preserves the hash', function (done) {
+      const steps = [
+        function (location) {
+          expect(location.pathname).toEqual('/')
+          expect(location.search).toEqual('')
+          expect(location.hash).toEqual('')
+          expect(location.state).toEqual(null)
+          expect(location.action).toEqual(POP)
+
+          history.pushState({ the: 'state' }, '/home?the=query#the-hash')
+        },
+        function (location) {
+          expect(location.pathname).toEqual('/home')
+          expect(location.search).toEqual('?the=query')
+          expect(location.hash).toEqual('#the-hash')
+          expect(location.state).toEqual({ the: 'state' })
+          expect(location.action).toEqual(PUSH)
+        }
+      ]
+
+      unlisten = history.listen(execSteps(steps, done))
+    })
+  })
+}
+
+export default describeHashSupport

modules/createBrowserHistory.js

@@ -60,14 +60,14 @@ function createBrowserHistory(options) {
   }
 
   function finishTransition(location) {
-    let { basename, pathname, search, state, action, key } = location
+    let { basename, pathname, search, hash, state, action, key } = location
 
     if (action === POP)
       return // Nothing to do.
 
     saveState(key, state)
 
-    let path = (basename || '') + pathname + search
+    let path = (basename || '') + pathname + search + hash
     let historyState = {
       key
     }