maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 05:00:43 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename canonicalRouteUrl to canonicalRoutePath

Browse source
This commit is contained in:
Kimmo Puputti 2017-10-26 14:12:45 +03:00
parent 482db41992
commit a798d9a741
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Routes.js
View file

@ -8,7 +8,7 @@ import { NamedRedirect } from './components';
import { locationChanged } from './ducks/Routing.duck';
import * as propTypes from './util/propTypes';
import * as log from './util/log';
import { canonicalRouteUrl } from './util/routes';
import { canonicalRoutePath } from './util/routes';
import routeConfiguration from './routeConfiguration';
const { arrayOf, bool, object, func, shape, string } = PropTypes;
@ -38,7 +38,7 @@ const callLoadData = props => {
};
const handleLocationChanged = (dispatch, location) => {
const url = canonicalRouteUrl(routeConfiguration(), location);
const url = canonicalRoutePath(routeConfiguration(), location);
dispatch(locationChanged(location, url));
};

2
src/util/routes.js
View file

@ -98,7 +98,7 @@ export const findRouteByRouteName = (nameToFind, routes) => {
* @return {String} Canonical URL of the given location
*
*/
export const canonicalRouteUrl = (routes, location) => {
export const canonicalRoutePath = (routes, location) => {
const { pathname, search, hash } = location;
const matches = matchPathname(pathname, routes);

16
src/util/routes.test.js
View file

@ -4,7 +4,7 @@ import { RoutesProvider } from '../components';
import routeConfiguration from '../routeConfiguration';
import { renderDeep, renderShallow } from './test-helpers';
import * as propTypes from './propTypes';
import { createResourceLocatorString, findRouteByRouteName, canonicalRouteUrl } from './routes';
import { createResourceLocatorString, findRouteByRouteName, canonicalRoutePath } from './routes';
const { arrayOf } = PropTypes;
@ -69,7 +69,7 @@ describe('util/routes.js', () => {
});
});
describe('canonicalRouteUrl', () => {
describe('canonicalRoutePath', () => {
it('handles non-listing route', () => {
const routes = routeConfiguration();
const location = {
@ -77,7 +77,7 @@ describe('util/routes.js', () => {
search: '?some=value',
hash: '#and-some-hash',
};
expect(canonicalRouteUrl(routes, location)).toEqual('/?some=value#and-some-hash');
expect(canonicalRoutePath(routes, location)).toEqual('/?some=value#and-some-hash');
});
it('handles ListingPage', () => {
const routes = routeConfiguration();
@ -86,7 +86,7 @@ describe('util/routes.js', () => {
search: '',
hash: '',
};
expect(canonicalRouteUrl(routes, location)).toEqual(
expect(canonicalRoutePath(routes, location)).toEqual(
'/l/00000000-0000-0000-0000-000000000000'
);
});
@ -97,7 +97,7 @@ describe('util/routes.js', () => {
search: '',
hash: '',
};
expect(canonicalRouteUrl(routes, location)).toEqual('/l');
expect(canonicalRoutePath(routes, location)).toEqual('/l');
});
it('handles CheckoutPage', () => {
const routes = routeConfiguration();
@ -106,7 +106,7 @@ describe('util/routes.js', () => {
search: '',
hash: '',
};
expect(canonicalRouteUrl(routes, location)).toEqual(
expect(canonicalRoutePath(routes, location)).toEqual(
'/l/some-slug-here/00000000-0000-0000-0000-000000000000/checkout'
);
});
@ -117,7 +117,7 @@ describe('util/routes.js', () => {
search: '',
hash: '',
};
expect(canonicalRouteUrl(routes, location)).toEqual('/l/new');
expect(canonicalRoutePath(routes, location)).toEqual('/l/new');
});
it('handles ListingPageCanonical', () => {
const routes = routeConfiguration();
@ -126,7 +126,7 @@ describe('util/routes.js', () => {
search: '',
hash: '',
};
expect(canonicalRouteUrl(routes, location)).toEqual(
expect(canonicalRoutePath(routes, location)).toEqual(
'/l/00000000-0000-0000-0000-000000000000'
);
});