Skip to content
Merged
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 packages/boilerplate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"prettify": "prettier --ignore-path=.eslintignore '**/*' --write",
"eslint": "eslint",
"lint": "eslint .",
"vulnerabilities": "snyk test"
"vulnerabilities": "mkdir node_modules; snyk test"
},
"dependencies": {
"@babel/polyfill": "^7.0.0-rc.3",
Expand Down
6 changes: 6 additions & 0 deletions packages/integration-tests/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules/
yarn-error.log

*.snap

.eslintignore
11 changes: 11 additions & 0 deletions packages/integration-tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const path = require('path')

function res() {
const segments = Array.from(arguments)
segments.unshift(__dirname)
return path.join.apply(undefined, segments)
}

module.exports = {
extends: [res('../../.eslintrc.js')],
}
1 change: 1 addition & 0 deletions packages/integration-tests/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('../../.prettierrc')
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
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'
import awaitUrlChange from './awaitUrlChange'
import { get, clear } from '../src/history/utils/sessionStorage'
import { locationToUrl } from '../src/utils'
import { createRouter } from '../src'

export default async (...allArgs) => {
const args = allArgs.filter((arg) => typeof arg !== 'function')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import renderer from 'react-test-renderer'
import { createStore, applyMiddleware } from 'redux'
import { Provider } from 'react-redux'

import { createRouter } from '../src'
import { createRouter } from '@respond-framework/rudy/src'

import Link, { NavLink } from '../src/Link'
import Link, { NavLink } from '@respond-framework/rudy/src/Link'

const createLink = async (props, initialPath, options, isNavLink) => {
const link = isNavLink ? <NavLink {...props} /> : <Link {...props} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { applyMiddleware, createStore, combineReducers } from 'redux'
import { createRouter, createScene } from '../src'
import { NOT_FOUND } from '../src/types'
import { createRouter, createScene } from '@respond-framework/rudy/src'
import { NOT_FOUND } from '@respond-framework/rudy/src/types'

import fakeAsyncWork from './fakeAsyncWork'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import createSmartHistory from '../src/history'
import { createInitialState } from '../src/core/createReducer'
import { NOT_FOUND } from '../src/types'
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'

export default async (type, pathname) => {
// eslint-disable-line import/prefer-default-export
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { applyMiddleware, createStore, combineReducers } from 'redux'
import reduxThunk from 'redux-thunk'
import { createRouter, createScene } from '../src'
import { NOT_FOUND } from '../src/types'
import { createRouter, createScene } from '@respond-framework/rudy/src'
import { NOT_FOUND } from '@respond-framework/rudy/src/types'

import fakeAsyncWork from './fakeAsyncWork'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { applyMiddleware, createStore } from 'redux'
import reduxThunk from 'redux-thunk'
import { createRouter } from '../src'
import { createRouter } from '@respond-framework/rudy/src'

const setup = (
path = '/',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createStore, applyMiddleware, combineReducers } from 'redux'
import createRouter from '../src/core/createRouter'
import createRouter from '@respond-framework/rudy/src/core/createRouter'

export default async (
path = '/',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NOT_FOUND } from '../../src/types'
import { NOT_FOUND } from '@respond-framework/rudy/src/types'
import createLink, { event } from '../../__test-helpers__/createLink'

test('ON_CLICK: dispatches location-aware action', async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import createTest from '../../__helpers__/createTest'

jest.mock('../../src/utils/isHydrate', () => () => false)
jest.mock('../../src/utils/isServer', () => () => false)
jest.mock('@respond-framework/rudy/src/utils/isHydrate', () => () => false)
jest.mock('@respond-framework/rudy/src/utils/isServer', () => () => false)

createTest('callbacks called on load if SPA', {
FIRST: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addRoutes } from '@respond-framework/rudy/src/actions'
import createTest from '../../../__helpers__/createTest'
import { addRoutes } from '../../../src/actions'

createTest(
'dispatch(addRoutes(routes))',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { changeBasename } from '@respond-framework/rudy/src/actions'
import createTest from '../../../__helpers__/createTest'
import { changeBasename } from '../../../src/actions'

createTest(
'dispatch(changeBasename(name))',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import createTest from '../../../__helpers__/createTest'
import {
push,
replace,
Expand All @@ -13,7 +12,8 @@ import {
setHash,
setBasename,
redirect,
} from '../../../src/actions'
} from '@respond-framework/rudy/src/actions'
import createTest from '../../../__helpers__/createTest'

const routes = {
FIRST: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { notFound } from '@respond-framework/rudy/src/actions'
import createScene from '@respond-framework/rudy/src/createScene'
import createTest from '../../../__helpers__/createTest'
import { notFound } from '../../../src/actions'
import createScene from '../../../src/createScene'

createTest('dispatch(notFound())', {}, [notFound()])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { redirect } from '@respond-framework/rudy/src/actions'
import createTest from '../../../__helpers__/createTest'
import { redirect } from '../../../src/actions'

createTest('dispatch(redirect(action))', {}, [redirect({ type: 'REDIRECTED' })])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { jump } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { jump } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { jump } from '@respond-framework/rudy/src/actions'
import createTest, {
resetBrowser,
setupStore,
} from '../../../../__helpers__/createTest'
import { jump } from '../../../../src/actions'

beforeEach(async () => {
await resetBrowser()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { push } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { push } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { push } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { push } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { replace } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { replace } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { reset } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { reset } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { reset } from '@respond-framework/rudy/src/actions'
import createTest, {
resetBrowser,
setupStore,
} from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { reset } from '../../../../src/actions'

beforeEach(async () => {
await resetBrowser()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { set, setState } from '@respond-framework/rudy/src/actions'
import createTest, { resetBrowser } from '../../../../__helpers__/createTest'
import { set, setState } from '../../../../src/actions'

beforeEach(resetBrowser)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { jump } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { jump } from '../../../../src/actions'

createTest(
'set(action, n)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { jump } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { jump } from '../../../../src/actions'

createTest(
'set(action, n)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { jump } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { jump } from '../../../../src/actions'

createTest(
'jump(delta, any, any, action)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { push } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { push } from '../../../../src/actions'

createTest(
'set(action, n)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { replace } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { replace } from '../../../../src/actions'

createTest(
'set(action, n)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { reset } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { reset } from '../../../../src/actions'

createTest(
'reset(actions)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { reset } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { reset } from '../../../../src/actions'

createTest(
'reset(actions, index)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { reset } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { reset } from '../../../../src/actions'

createTest(
'reset(actions, index)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { set } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { set } from '../../../../src/actions'

createTest(
'set(action)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { locationToUrl } from '@respond-framework/rudy/src/utils'
import { set } from '@respond-framework/rudy/src/actions'
import createTest from '../../../../__helpers__/createTest'
import { locationToUrl } from '../../../../src/utils'
import { set } from '../../../../src/actions'

createTest(
'set(action, n)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
import createTest, { setupStore } from '../../../../__helpers__/createTest'
import { get } from '../../../../src/history/utils/sessionStorage'

// 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('../../../../src/history/utils/supports', () => ({
...require.requireActual('../../../../src/history/utils/supports'),
jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
...require.requireActual(
'@respond-framework/rudy/src/history/utils/supports',
),
supportsSession: jest.fn(() => true),
supportsHistory: jest.fn(() => false),
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ 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('../../../../src/history/utils/supports', () => ({
...require.requireActual('../../../../src/history/utils/supports'),
jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
...require.requireActual(
'@respond-framework/rudy/src/history/utils/supports',
),
supportsSession: jest.fn(() => false),
}))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ 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('../../../../src/history/utils/supports', () => ({
...require.requireActual('../../../../src/history/utils/supports'),
jest.mock('@respond-framework/rudy/src/history/utils/supports', () => ({
...require.requireActual(
'@respond-framework/rudy/src/history/utils/supports',
),
supportsSession: jest.fn(() => false),
}))

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
import createTest, { setupStore } from '../../../../__helpers__/createTest'
import { get } from '../../../../src/history/utils/sessionStorage'

beforeAll(async () => {
const routesMap = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
import createTest, { setupStore } from '../../../../__helpers__/createTest'
import { get } from '../../../../src/history/utils/sessionStorage'

beforeAll(async () => {
const routesMap = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get } from '@respond-framework/rudy/src/history/utils/sessionStorage'
import createTest, { setupStore } from '../../../../__helpers__/createTest'
import { get } from '../../../../src/history/utils/sessionStorage'

// note restoreFromMiddle is in fact the same as restoreFromFront
// since `sessionStorage.js` clips all entries after the current index
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { callRoute } from '@respond-framework/rudy/src/utils'
import createTest from '../../__helpers__/createTest'
import { callRoute } from '../../src/utils'

createTest(
'callRoute(action | type, routeKey, ...args)',
Expand Down
Loading