-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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
[http] Enhance versioned router mock for easier introspection #159669
Merged
jloleysens
merged 4 commits into
elastic:main
from
jloleysens:enhance-versioned-router-mock
Jun 14, 2023
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
packages/core/http/core-http-router-server-mocks/src/versioned_router_mock_route.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import { createVersionedRouterMock } from './versioned_router.mock'; | ||
|
||
describe('createVersionedRouterMock#getRoute', () => { | ||
it('throws if no routes are registered', () => { | ||
const versionedRouter = createVersionedRouterMock(); | ||
expect(() => versionedRouter.getRoute('get', '/foo')).toThrow(/No routes registered/); | ||
versionedRouter.get({ path: '/foo', access: 'internal' }); | ||
expect(() => versionedRouter.getRoute('get', '/foo')).not.toThrow(); | ||
expect(() => versionedRouter.getRoute('get', '/bar')).toThrow(/No routes registered/); | ||
}); | ||
it('allows versioned routes to be introspected', () => { | ||
const versionedRouter = createVersionedRouterMock(); | ||
const route = versionedRouter.get({ path: '/foo', access: 'internal' }); | ||
|
||
// Empty case | ||
expect(versionedRouter.getRoute('get', '/foo')).toMatchInlineSnapshot(` | ||
Object { | ||
"config": Object { | ||
"access": "internal", | ||
"path": "/foo", | ||
}, | ||
"versions": Object {}, | ||
} | ||
`); | ||
|
||
const myHandler = jest.fn(); | ||
route | ||
.addVersion({ validate: false, version: '1' }, myHandler) | ||
.addVersion({ validate: false, version: '2' }, myHandler) | ||
.addVersion({ validate: false, version: '3' }, myHandler); | ||
|
||
const introspectedRoute = versionedRouter.getRoute('get', '/foo'); | ||
expect(introspectedRoute).toMatchInlineSnapshot(` | ||
Object { | ||
"config": Object { | ||
"access": "internal", | ||
"path": "/foo", | ||
}, | ||
"versions": Object { | ||
"1": Object { | ||
"config": Object { | ||
"validate": false, | ||
"version": "1", | ||
}, | ||
"handler": [MockFunction], | ||
}, | ||
"2": Object { | ||
"config": Object { | ||
"validate": false, | ||
"version": "2", | ||
}, | ||
"handler": [MockFunction], | ||
}, | ||
"3": Object { | ||
"config": Object { | ||
"validate": false, | ||
"version": "3", | ||
}, | ||
"handler": [MockFunction], | ||
}, | ||
}, | ||
} | ||
`); | ||
|
||
expect(introspectedRoute.versions['3'].handler).toBe(myHandler); | ||
expect(introspectedRoute.versions['3'].config.version).toBe('3'); | ||
expect(introspectedRoute.versions['3'].config.validate).toBe(false); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: I would have done that within the
MockedVersionedRouter
implementation (basically constructing this map / info at registration time) instead of going though the mock's calls in a second time. But as long as it works, it's fine.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that was an alternative I also considered, but my guess is that this function won't be used a lot so I sacrificed time over space. Might be the wrong assumption, but we should be able to change the implementation without breaking stuff down the line.