github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 10:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update KibanaRequest to use the new WHATWG URL API (#80713)

Browse source
This commit is contained in:
Thomas Watson 2020-10-29 14:35:48 +01:00 • committed by GitHub
parent 275c30a926
commit 1407f713e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 262 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

10
x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
View file

@ -58,7 +58,7 @@ const createService = async (serverBasePath: string = '') => {
serverBasePath,
} as HttpServiceSetup['basePath'];
httpSetup.basePath.get = jest.fn().mockImplementation((request: KibanaRequest) => {
const { spaceId } = getSpaceIdFromPath(request.url.path);
const { spaceId } = getSpaceIdFromPath(request.url.pathname);
if (spaceId !== DEFAULT_SPACE_ID) {
return `/s/${spaceId}`;
@ -83,7 +83,7 @@ describe('SpacesService', () => {
const spacesServiceSetup = await createService();
const request: KibanaRequest = {
url: { path: '/app/kibana' },
url: { pathname: '/app/kibana' },
} as KibanaRequest;
expect(spacesServiceSetup.getSpaceId(request)).toEqual(DEFAULT_SPACE_ID);
@ -93,7 +93,7 @@ describe('SpacesService', () => {
const spacesServiceSetup = await createService();
const request: KibanaRequest = {
url: { path: '/s/foo/app/kibana' },
url: { pathname: '/s/foo/app/kibana' },
} as KibanaRequest;
expect(spacesServiceSetup.getSpaceId(request)).toEqual('foo');
@ -140,7 +140,7 @@ describe('SpacesService', () => {
const spacesServiceSetup = await createService();
const request: KibanaRequest = {
url: { path: '/app/kibana' },
url: { pathname: '/app/kibana' },
} as KibanaRequest;
expect(spacesServiceSetup.isInDefaultSpace(request)).toEqual(true);
@ -150,7 +150,7 @@ describe('SpacesService', () => {
const spacesServiceSetup = await createService();
const request: KibanaRequest = {
url: { path: '/s/foo/app/kibana' },
url: { pathname: '/s/foo/app/kibana' },
} as KibanaRequest;
expect(spacesServiceSetup.isInDefaultSpace(request)).toEqual(false);