refactor: Allow integration tests to use source code (#25)

* Remove the need to import built versions of packages in integration tests using jest's moduleNameMapper option * Upgrade jest with bugfix: jestjs/jest#8210 * prettify
respond-framework · Apr 11, 2019 · b5c3d34 · b5c3d34
1 parent 3492cac
commit b5c3d34
Show file tree

Hide file tree

Showing 57 changed files with 601 additions and 389 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -7,6 +7,5 @@ module.exports = {
       path.resolve(__dirname, './config/babel-jest'),
     ),
   },
-  testPathIgnorePatterns: ['/node_modules/', '<rootDir>/cjs/', '<rootDir>/es/'],
   testEnvironment: 'node',
 }
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@babel/runtime": "^7.3.4",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^9.0.0-beta.3",
-    "babel-jest": "^24.1.0",
+    "babel-jest": "^24.7.1",
     "babel-loader": "^8.0.4",
     "babel-watch": "git://github.com/hedgepigdaniel/babel-watch.git",
     "cross-env": "^5.0.1",
@@ -55,8 +55,8 @@
     "flow-bin": "^0.78.0",
     "flow-copy-source": "^2.0.2",
     "husky": "^0.14.3",
-    "jest": "^24.1.0",
-    "jest-cli": "^24.1.0",
+    "jest": "^24.7.1",
+    "jest-cli": "^24.7.1",
     "jest-localstorage-mock": "^2.4.0",
     "lerna": "^3.13.1",
     "lint-staged": "^7.2.0",

diff --git a/packages/integration-tests/__helpers__/createTest.js b/packages/integration-tests/__helpers__/createTest.js
@@ -2,9 +2,9 @@ import { applyMiddleware, createStore, combineReducers } from 'redux'
 import {
   get,
   clear,
-} from '@respond-framework/rudy/src/history/utils/sessionStorage'
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { createRouter } from '@respond-framework/rudy/src'
+} from '@respond-framework/rudy/history/utils/sessionStorage'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { createRouter } from '@respond-framework/rudy'
 import awaitUrlChange from './awaitUrlChange'
 
 export default async (...allArgs) => {

diff --git a/packages/integration-tests/__test-helpers__/createLink.js b/packages/integration-tests/__test-helpers__/createLink.js
@@ -3,9 +3,9 @@ import renderer from 'react-test-renderer'
 import { createStore, applyMiddleware } from 'redux'
 import { Provider } from 'react-redux'
 
-import { createRouter } from '@respond-framework/rudy/src'
+import { createRouter } from '@respond-framework/rudy'
 
-import Link, { NavLink } from '@respond-framework/rudy/src/Link'
+import Link, { NavLink } from '@respond-framework/link'
 
 const createLink = async (props, initialPath, options, isNavLink) => {
   const link = isNavLink ? <NavLink {...props} /> : <Link {...props} />

diff --git a/packages/integration-tests/__test-helpers__/createSequence.js b/packages/integration-tests/__test-helpers__/createSequence.js
@@ -1,6 +1,6 @@
 import { applyMiddleware, createStore, combineReducers } from 'redux'
-import { createRouter, createScene } from '@respond-framework/rudy/src'
-import { NOT_FOUND } from '@respond-framework/rudy/src/types'
+import { createRouter, createScene } from '@respond-framework/rudy'
+import { NOT_FOUND } from '@respond-framework/rudy/types'
 
 import fakeAsyncWork from './fakeAsyncWork'
 

diff --git a/packages/integration-tests/__test-helpers__/reducerParameters.js b/packages/integration-tests/__test-helpers__/reducerParameters.js
@@ -1,6 +1,6 @@
-import createSmartHistory from '@respond-framework/rudy/src/history'
-import { createInitialState } from '@respond-framework/rudy/src/core/createReducer'
-import { NOT_FOUND } from '@respond-framework/rudy/src/types'
+import { createHistory as createSmartHistory } from '@respond-framework/rudy'
+import { createInitialState } from '@respond-framework/rudy/core/createReducer'
+import { NOT_FOUND } from '@respond-framework/rudy/types'
 
 export default async (type, pathname) => {
   // eslint-disable-line import/prefer-default-export

diff --git a/packages/integration-tests/__test-helpers__/rudySetup.js b/packages/integration-tests/__test-helpers__/rudySetup.js
@@ -1,7 +1,7 @@
 import { applyMiddleware, createStore, combineReducers } from 'redux'
 import reduxThunk from 'redux-thunk'
-import { createRouter, createScene } from '@respond-framework/rudy/src'
-import { NOT_FOUND } from '@respond-framework/rudy/src/types'
+import { createRouter, createScene } from '@respond-framework/rudy'
+import { NOT_FOUND } from '@respond-framework/rudy/types'
 
 import fakeAsyncWork from './fakeAsyncWork'
 

diff --git a/packages/integration-tests/__test-helpers__/setup.js b/packages/integration-tests/__test-helpers__/setup.js
@@ -1,6 +1,6 @@
 import { applyMiddleware, createStore } from 'redux'
 import reduxThunk from 'redux-thunk'
-import { createRouter } from '@respond-framework/rudy/src'
+import { createRouter } from '@respond-framework/rudy'
 
 const setup = (
   path = '/',

diff --git a/packages/integration-tests/__test-helpers__/setupThunk.js b/packages/integration-tests/__test-helpers__/setupThunk.js
@@ -1,5 +1,5 @@
 import { createStore, applyMiddleware, combineReducers } from 'redux'
-import createRouter from '@respond-framework/rudy/src/core/createRouter'
+import createRouter from '@respond-framework/rudy/core/createRouter'
 
 export default async (
   path = '/',

diff --git a/packages/integration-tests/__tests__/Link/Link.js b/packages/integration-tests/__tests__/Link/Link.js
@@ -1,4 +1,4 @@
-import { NOT_FOUND } from '@respond-framework/rudy/src/types'
+import { NOT_FOUND } from '@respond-framework/rudy/types'
 import createLink, { event } from '../../__test-helpers__/createLink'
 
 test('ON_CLICK: dispatches location-aware action', async () => {

diff --git a/packages/integration-tests/__tests__/integration/SPA.js b/packages/integration-tests/__tests__/integration/SPA.js
@@ -1,7 +1,7 @@
 import createTest from '../../__helpers__/createTest'
 
-jest.mock('@respond-framework/rudy/src/utils/isHydrate', () => () => false)
-jest.mock('@respond-framework/utils/cjs/isServer', () => () => false)
+jest.mock('@respond-framework/rudy/utils/isHydrate', () => () => false)
+jest.mock('@respond-framework/utils/isServer', () => () => false)
 
 createTest('callbacks called on load if SPA', {
   FIRST: {

diff --git a/packages/integration-tests/__tests__/integration/actions/addRoutes.js b/packages/integration-tests/__tests__/integration/actions/addRoutes.js
@@ -1,4 +1,4 @@
-import { addRoutes } from '@respond-framework/rudy/src/actions'
+import { addRoutes } from '@respond-framework/rudy/actions'
 import createTest from '../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/actions/changeBasename.js b/packages/integration-tests/__tests__/integration/actions/changeBasename.js
@@ -1,4 +1,4 @@
-import { changeBasename } from '@respond-framework/rudy/src/actions'
+import { changeBasename } from '@respond-framework/rudy/actions'
 import createTest from '../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/actions/history.js b/packages/integration-tests/__tests__/integration/actions/history.js
@@ -12,7 +12,7 @@ import {
   setHash,
   setBasename,
   redirect,
-} from '@respond-framework/rudy/src/actions'
+} from '@respond-framework/rudy/actions'
 import createTest from '../../../__helpers__/createTest'
 
 const routes = {

diff --git a/packages/integration-tests/__tests__/integration/actions/notFound.js b/packages/integration-tests/__tests__/integration/actions/notFound.js
@@ -1,5 +1,5 @@
-import { notFound } from '@respond-framework/rudy/src/actions'
-import createScene from '@respond-framework/rudy/src/createScene'
+import { notFound } from '@respond-framework/rudy/actions'
+import createScene from '@respond-framework/rudy/createScene'
 import createTest from '../../../__helpers__/createTest'
 
 createTest('dispatch(notFound())', {}, [notFound()])

diff --git a/packages/integration-tests/__tests__/integration/actions/redirect.js b/packages/integration-tests/__tests__/integration/actions/redirect.js
@@ -1,4 +1,4 @@
-import { redirect } from '@respond-framework/rudy/src/actions'
+import { redirect } from '@respond-framework/rudy/actions'
 import createTest from '../../../__helpers__/createTest'
 
 createTest('dispatch(redirect(action))', {}, [redirect({ type: 'REDIRECTED' })])

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/jump.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/jump.js
@@ -1,4 +1,4 @@
-import { jump } from '@respond-framework/rudy/src/actions'
+import { jump } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/jump2N.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/jump2N.js
@@ -1,4 +1,4 @@
-import { jump } from '@respond-framework/rudy/src/actions'
+import { jump } from '@respond-framework/rudy/actions'
 import createTest, {
   resetBrowser,
   setupStore,

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/push.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/push.js
@@ -1,4 +1,4 @@
-import { push } from '@respond-framework/rudy/src/actions'
+import { push } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/regularAction.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/regularAction.js
@@ -1,4 +1,4 @@
-import { push } from '@respond-framework/rudy/src/actions'
+import { push } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/replace.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/replace.js
@@ -1,4 +1,4 @@
-import { replace } from '@respond-framework/rudy/src/actions'
+import { replace } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/reset.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/reset.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { reset } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { reset } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/resetOnLoad.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/resetOnLoad.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { reset } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { reset } from '@respond-framework/rudy/actions'
 import createTest, {
   resetBrowser,
   setupStore,

diff --git a/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/set.js b/packages/integration-tests/__tests__/integration/browser/actionsInCallbacks/set.js
@@ -1,4 +1,4 @@
-import { set, setState } from '@respond-framework/rudy/src/actions'
+import { set, setState } from '@respond-framework/rudy/actions'
 import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
 
 beforeEach(resetBrowser)

diff --git a/packages/integration-tests/__tests__/integration/browser/history/jump.js b/packages/integration-tests/__tests__/integration/browser/history/jump.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { jump } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { jump } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/jump2N.js b/packages/integration-tests/__tests__/integration/browser/history/jump2N.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { jump } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { jump } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/jumpAction.js b/packages/integration-tests/__tests__/integration/browser/history/jumpAction.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { jump } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { jump } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/push.js b/packages/integration-tests/__tests__/integration/browser/history/push.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { push } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { push } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/replace.js b/packages/integration-tests/__tests__/integration/browser/history/replace.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { replace } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { replace } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/reset.js b/packages/integration-tests/__tests__/integration/browser/history/reset.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { reset } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { reset } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/resetIndex.js b/packages/integration-tests/__tests__/integration/browser/history/resetIndex.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { reset } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { reset } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/resetIndexN.js b/packages/integration-tests/__tests__/integration/browser/history/resetIndexN.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { reset } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { reset } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/set.js b/packages/integration-tests/__tests__/integration/browser/history/set.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { set } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { set } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/browser/history/setN.js b/packages/integration-tests/__tests__/integration/browser/history/setN.js
@@ -1,5 +1,5 @@
-import { locationToUrl } from '@respond-framework/rudy/src/utils'
-import { set } from '@respond-framework/rudy/src/actions'
+import { locationToUrl } from '@respond-framework/rudy/utils'
+import { set } from '@respond-framework/rudy/actions'
 import createTest from '../../../../__helpers__/createTest'
 
 createTest(

diff --git a/...ion-tests/__tests__/integration/browser/sessionStorage/MemoryHistoryWithSessionStorage.js b/...ion-tests/__tests__/integration/browser/sessionStorage/MemoryHistoryWithSessionStorage.js
@@ -1,14 +1,12 @@
-import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
+import { get } from '@respond-framework/rudy/history/utils/sessionStorage'
 import createTest, { setupStore } from '../../../../__helpers__/createTest'
 
 // MemoryHistory can be used as a fallback in the browser (ie. 8/9)
 // Those browsers do support SessionStorage, so we have capabilities to remember
 // entries even in those older browsers.
 
-jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
-  ...require.requireActual(
-    '@respond-framework/rudy/src/history/utils/supports',
-  ),
+jest.mock('@respond-framework/rudy/history/utils/supports', () => ({
+  ...require.requireActual('@respond-framework/rudy/history/utils/supports'),
   supportsSession: jest.fn(() => true),
   supportsHistory: jest.fn(() => false),
 }))

diff --git a/packages/integration-tests/__tests__/integration/browser/sessionStorage/historyFallback.js b/packages/integration-tests/__tests__/integration/browser/sessionStorage/historyFallback.js
@@ -3,10 +3,8 @@ import createTest, { setupStore } from '../../../../__helpers__/createTest'
 // when there is no `sessionStorage`, we fallback to our innovative solution of
 // storing all session info on EVERY entry of the real browser history!
 
-jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
-  ...require.requireActual(
-    '@respond-framework/rudy/src/history/utils/supports',
-  ),
+jest.mock('@respond-framework/rudy/history/utils/supports', () => ({
+  ...require.requireActual('@respond-framework/rudy/history/utils/supports'),
   supportsSession: jest.fn(() => false),
 }))
 

diff --git a/...ts/__tests__/integration/browser/sessionStorage/historyFallbackWithRedirectBeforeEnter.js b/...ts/__tests__/integration/browser/sessionStorage/historyFallbackWithRedirectBeforeEnter.js
@@ -3,10 +3,8 @@ import createTest, { setupStore } from '../../../../__helpers__/createTest'
 // when there is no `sessionStorage`, we fallback to our innovative solution of
 // storing all session info on EVERY entry of the real browser history!
 
-jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
-  ...require.requireActual(
-    '@respond-framework/rudy/src/history/utils/supports',
-  ),
+jest.mock('@respond-framework/rudy/history/utils/supports', () => ({
+  ...require.requireActual('@respond-framework/rudy/history/utils/supports'),
   supportsSession: jest.fn(() => false),
 }))
 

diff --git a/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromBack.js b/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromBack.js
@@ -1,4 +1,4 @@
-import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
+import { get } from '@respond-framework/rudy/history/utils/sessionStorage'
 import createTest, { setupStore } from '../../../../__helpers__/createTest'
 
 beforeAll(async () => {

diff --git a/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromFront.js b/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromFront.js
@@ -1,4 +1,4 @@
-import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
+import { get } from '@respond-framework/rudy/history/utils/sessionStorage'
 import createTest, { setupStore } from '../../../../__helpers__/createTest'
 
 beforeAll(async () => {

diff --git a/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromMiddle.js b/packages/integration-tests/__tests__/integration/browser/sessionStorage/restoreFromMiddle.js
@@ -1,4 +1,4 @@
-import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
+import { get } from '@respond-framework/rudy/history/utils/sessionStorage'
 import createTest, { setupStore } from '../../../../__helpers__/createTest'
 
 // note restoreFromMiddle is in fact the same as restoreFromFront

diff --git a/packages/integration-tests/__tests__/integration/callRoute.js b/packages/integration-tests/__tests__/integration/callRoute.js
@@ -1,4 +1,4 @@
-import { callRoute } from '@respond-framework/rudy/src/utils'
+import { callRoute } from '@respond-framework/rudy/utils'
 import createTest from '../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/callStartTrue.js b/packages/integration-tests/__tests__/integration/callStartTrue.js
@@ -2,9 +2,9 @@ import {
   transformAction,
   call,
   enter,
-} from '@respond-framework/rudy/src/middleware'
+} from '@respond-framework/rudy/middleware'
 
-import { compose } from '@respond-framework/rudy/src/core'
+import { compose } from '@respond-framework/rudy/core'
 import createTest from '../../__helpers__/createTest'
 
 createTest('call({ start: true })', {

diff --git a/packages/integration-tests/__tests__/integration/createRequest.js b/packages/integration-tests/__tests__/integration/createRequest.js
@@ -1,4 +1,4 @@
-import { Request } from '@respond-framework/rudy/src/core/createRequest'
+import { Request } from '@respond-framework/rudy/core/createRequest'
 import createTest from '../../__helpers__/createTest'
 
 createTest(

diff --git a/packages/integration-tests/__tests__/integration/createScene/actionCreators.js b/packages/integration-tests/__tests__/integration/createScene/actionCreators.js
@@ -1,4 +1,4 @@
-import createScene from '@respond-framework/rudy/src/createScene'
+import createScene from '@respond-framework/rudy/createScene'
 import createTest from '../../../__helpers__/createTest'
 
 const routesMap = {

diff --git a/packages/integration-tests/__tests__/integration/createScene/options.js b/packages/integration-tests/__tests__/integration/createScene/options.js
@@ -1,4 +1,4 @@
-import createScene from '@respond-framework/rudy/src/createScene'
+import createScene from '@respond-framework/rudy/createScene'
 import createTest from '../../../__helpers__/createTest'
 
 const routesMap = {

diff --git a/packages/integration-tests/__tests__/integration/createScene/returnedUtilities.js b/packages/integration-tests/__tests__/integration/createScene/returnedUtilities.js
@@ -1,4 +1,4 @@
-import createScene from '@respond-framework/rudy/src/createScene'
+import createScene from '@respond-framework/rudy/createScene'
 
 const routesMap = {
   SECOND: {

diff --git a/packages/integration-tests/__tests__/integration/formatRoutes.js b/packages/integration-tests/__tests__/integration/formatRoutes.js
@@ -1,4 +1,4 @@
-import { notFound } from '@respond-framework/rudy/src/actions'
+import { notFound } from '@respond-framework/rudy/actions'
 import createTest from '../../__helpers__/createTest'
 
 createTest('routes as path string', {

diff --git a/packages/integration-tests/__tests__/integration/hydrate.js b/packages/integration-tests/__tests__/integration/hydrate.js
@@ -1,7 +1,7 @@
 import createTest from '../../__helpers__/createTest'
 
-jest.mock('@respond-framework/rudy/src/utils/isHydrate', () => () => true)
-jest.mock('@respond-framework/utils/cjs/isServer', () => () => false)
+jest.mock('@respond-framework/rudy/utils/isHydrate', () => () => true)
+jest.mock('@respond-framework/utils/isServer', () => () => false)
 
 createTest('beforeEnter + thunk callbacks NOT called if isHydrate', {
   FIRST: {