Skip to content

Commit

Permalink
Remove deprecations
Browse files Browse the repository at this point in the history
Also, update createLocation signature and remove it from top-level
exports.

Closes #172
  • Loading branch information
mjackson committed Dec 9, 2015
1 parent 37bb527 commit b525b51
Show file tree
Hide file tree
Showing 22 changed files with 138 additions and 758 deletions.
12 changes: 3 additions & 9 deletions modules/__tests__/BrowserHistory-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { supportsHistory } from '../DOMUtils'
import createBrowserHistory from '../createBrowserHistory'
import describeInitialLocation from './describeInitialLocation'
import describeTransitions from './describeTransitions'
import describePushState from './describePushState'
import describePush from './describePush'
import describeReplaceState from './describeReplaceState'
import describeReplace from './describeReplace'
import describePopState from './describePopState'
import describePop from './describePop'
import describeHashSupport from './describeHashSupport'
import describeBasename from './describeBasename'
import describeQueries from './describeQueries'
Expand All @@ -20,11 +18,9 @@ describe('browser history', function () {
if (supportsHistory()) {
describeInitialLocation(createBrowserHistory)
describeTransitions(createBrowserHistory)
describePushState(createBrowserHistory)
describePush(createBrowserHistory)
describeReplaceState(createBrowserHistory)
describeReplace(createBrowserHistory)
describePopState(createBrowserHistory)
describePop(createBrowserHistory)
describeHashSupport(createBrowserHistory)
describeBasename(createBrowserHistory)
describeQueries(createBrowserHistory)
Expand All @@ -33,11 +29,9 @@ describe('browser history', function () {
describe.skip(null, function () {
describeInitialLocation(createBrowserHistory)
describeTransitions(createBrowserHistory)
describePushState(createBrowserHistory)
describePush(createBrowserHistory)
describeReplaceState(createBrowserHistory)
describeReplace(createBrowserHistory)
describePopState(createBrowserHistory)
describePop(createBrowserHistory)
describeHashSupport(createBrowserHistory)
describeBasename(createBrowserHistory)
describeQueries(createBrowserHistory)
Expand Down
10 changes: 3 additions & 7 deletions modules/__tests__/HashHistory-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ import { supportsGoWithoutReloadUsingHash, supportsHistory } from '../DOMUtils'
import createHashHistory from '../createHashHistory'
import describeInitialLocation from './describeInitialLocation'
import describeTransitions from './describeTransitions'
import describePushState from './describePushState'
import describePush from './describePush'
import describeReplaceState from './describeReplaceState'
import describeReplace from './describeReplace'
import describePopState from './describePopState'
import describePop from './describePop'
import describeQueryKey from './describeQueryKey'
import describeBasename from './describeBasename'
import describeQueries from './describeQueries'
Expand All @@ -21,18 +19,16 @@ describe('hash history', function () {

describeInitialLocation(createHashHistory)
describeTransitions(createHashHistory)
describePushState(createHashHistory)
describePush(createHashHistory)
describeReplaceState(createHashHistory)
describeReplace(createHashHistory)
describeBasename(createHashHistory)
describeQueries(createHashHistory)

if (supportsHistory()) {
describePopState(createHashHistory)
describePop(createHashHistory)
} else {
describe.skip(null, function () {
describePopState(createHashHistory)
describePop(createHashHistory)
})
}

Expand Down
4 changes: 0 additions & 4 deletions modules/__tests__/MemoryHistory-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import expect from 'expect'
import createMemoryHistory from '../createMemoryHistory'
import describeInitialLocation from './describeInitialLocation'
import describeTransitions from './describeTransitions'
import describePushState from './describePushState'
import describePush from './describePush'
import describeReplaceState from './describeReplaceState'
import describeReplace from './describeReplace'
import describeBasename from './describeBasename'
import describeQueries from './describeQueries'
Expand All @@ -13,9 +11,7 @@ import describeGo from './describeGo'
describe('memory history', function () {
describeInitialLocation(createMemoryHistory)
describeTransitions(createMemoryHistory)
describePushState(createMemoryHistory)
describePush(createMemoryHistory)
describeReplaceState(createMemoryHistory)
describeReplace(createMemoryHistory)
describeBasename(createMemoryHistory)
describeQueries(createMemoryHistory)
Expand Down
64 changes: 7 additions & 57 deletions modules/__tests__/describeBasename.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,6 @@ function describeBasename(createHistory) {
unlisten()
})

describe('in pushState', function () {
it('works', function (done) {
let steps = [
function (location) {
expect(location.pathname).toEqual('/')
expect(location.search).toEqual('')
expect(location.state).toEqual(null)
expect(location.action).toEqual(POP)
expect(location.basename).toEqual('')

history.pushState({ the: 'state' }, '/home')
},
function (location) {
expect(location.pathname).toEqual('/home')
expect(location.search).toEqual('')
expect(location.state).toEqual({ the: 'state' })
expect(location.action).toEqual(PUSH)
expect(location.basename).toEqual('/base/url')
}
]

unlisten = history.listen(execSteps(steps, done))
})
})

describe('in push', function () {
it('works with string', function (done) {
let steps = [
Expand Down Expand Up @@ -109,31 +84,6 @@ function describeBasename(createHistory) {
})
})

describe('in replaceState', function () {
it('works', function (done) {
let steps = [
function (location) {
expect(location.pathname).toEqual('/')
expect(location.search).toEqual('')
expect(location.state).toEqual(null)
expect(location.action).toEqual(POP)
expect(location.basename).toEqual('')

history.replaceState({ the: 'state' }, '/home')
},
function (location) {
expect(location.pathname).toEqual('/home')
expect(location.search).toEqual('')
expect(location.state).toEqual({ the: 'state' })
expect(location.action).toEqual(REPLACE)
expect(location.basename).toEqual('/base/url')
}
]

unlisten = history.listen(execSteps(steps, done))
})
})

describe('in replace', function () {
it('works with string', function (done) {
let steps = [
Expand Down Expand Up @@ -214,10 +164,10 @@ function describeBasename(createHistory) {
})
})

describe('basename through <base href>', () => {
describe('basename through <base href>', function () {
let history, unlisten, base

before('add base element', () => {
before('add base element', function () {
base = document.createElement('base')
base.href = '/base/url'
document.head.appendChild(base)
Expand All @@ -227,23 +177,23 @@ function describeBasename(createHistory) {
history = useBasename(createHistory)()
})

describe('in createPath', () => {
describe('in createPath', function () {
it('works', function () {
expect(
history.createPath('/the/path')
).toEqual('/base/url/the/path')
})
})

describe('in createHref', () => {
describe('in createHref', function () {
it('works', function () {
expect(
stripHash(history.createHref('/the/path'))
).toEqual('/base/url/the/path')
})
})

describe('in push', () => {
describe('in push', function () {
it('works', function (done) {
let steps = [
function (location) {
Expand Down Expand Up @@ -271,12 +221,12 @@ function describeBasename(createHistory) {
})
})

afterEach(() => {
afterEach(function () {
if (unlisten)
unlisten()
})

after(() => {
after(function () {
document.head.removeChild(base)
})

Expand Down
25 changes: 25 additions & 0 deletions modules/__tests__/describePop.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
function describePop(createHistory) {
describe('when a listenBefore hook is added', function () {
let history, unlisten

beforeEach(function () {
history = createHistory()
history.push('/home')
})

afterEach(function () {
if (unlisten)
unlisten()
})

it('is called when browser navigation is used', function (done) {
unlisten = history.listenBefore(function () {
done()
})

window.history.back()
})
})
}

export default describePop
48 changes: 0 additions & 48 deletions modules/__tests__/describePopState.js

This file was deleted.

69 changes: 0 additions & 69 deletions modules/__tests__/describePushState.js

This file was deleted.

0 comments on commit b525b51

Please sign in to comment.