Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update history and imports in test code #2613

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/__tests__/History-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { render, unmountComponentAtNode } from 'react-dom'
import History from '../History'
import Router from '../Router'
import Route from '../Route'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'

describe('History Mixin', function () {

Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/IndexLink-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React, { Component } from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import IndexRoute from '../IndexRoute'
import IndexLink from '../IndexLink'
import Router from '../Router'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/IndexRedirect-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import IndexRedirect from '../IndexRedirect'
import Router from '../Router'
import Route from '../Route'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/IndexRoute-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React, { Component } from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import IndexRoute from '../IndexRoute'
import Router from '../Router'
import Route from '../Route'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/Link-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import expect, { spyOn } from 'expect'
import React, { Component } from 'react'
import { Simulate } from 'react-addons-test-utils'
import { render } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import execSteps from './execSteps'
import Router from '../Router'
import Route from '../Route'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/Redirect-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import Redirect from '../Redirect'
import Router from '../Router'
import Route from '../Route'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/RouteComponent-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React, { Component } from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import Router from '../Router'

const { object } = React.PropTypes
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/isActive-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect'
import React from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import IndexRoute from '../IndexRoute'
import Router from '../Router'
import Route from '../Route'
Expand Down
2 changes: 1 addition & 1 deletion modules/__tests__/transitionHooks-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect, { spyOn } from 'expect'
import React, { Component } from 'react'
import { render, unmountComponentAtNode } from 'react-dom'
import createHistory from 'history/lib/createMemoryHistory'
import { createMemoryHistory as createHistory } from 'history'
import useQueries from 'history/lib/useQueries'
import execSteps from './execSteps'
import Router from '../Router'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"express": "^4.13.3",
"express-urlrewrite": "^1.2.0",
"gzip-size": "^3.0.0",
"history": "^1.12.5",
"history": "^1.13.1",
"isparta-loader": "^1.0.0",
"karma": "^0.13.13",
"karma-browserstack-launcher": "^0.1.4",
Expand Down