-
Notifications
You must be signed in to change notification settings - Fork 8.1k
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
[Endpoint] EMT-65:always return accurate endpoint count #54423
Merged
nnamdifrankie
merged 5 commits into
elastic:master
from
nnamdifrankie:EMT-65_always_return_accurate_total_endpoints
Jan 10, 2020
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
64d23a9
EMT-65:always return accurate endpoint count
nnamdifrankie 1bd1fb5
Merge branch 'master' into EMT-65_always_return_accurate_total_endpoints
elasticmachine 5671a43
Merge branch 'master' into EMT-65_always_return_accurate_total_endpoints
elasticmachine ed13c0c
EMT-65:use shortened form
nnamdifrankie 8d5aaf1
Merge branch 'EMT-65_always_return_accurate_total_endpoints' of githu…
nnamdifrankie 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,9 +10,24 @@ export default function({ getService }: FtrProviderContext) { | |
const esArchiver = getService('esArchiver'); | ||
const supertest = getService('supertest'); | ||
describe('test endpoints api', () => { | ||
before(() => esArchiver.load('endpoint/endpoints')); | ||
after(() => esArchiver.unload('endpoint/endpoints')); | ||
describe('GET /api/endpoint/endpoints', () => { | ||
describe('POST /api/endpoint/endpoints when index is empty', () => { | ||
it('endpoints api should return empty result when index is empty', async () => { | ||
await esArchiver.unload('endpoint/endpoints'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice |
||
const { body } = await supertest | ||
.post('/api/endpoint/endpoints') | ||
.set('kbn-xsrf', 'xxx') | ||
.send() | ||
.expect(200); | ||
expect(body.total).to.eql(0); | ||
expect(body.endpoints.length).to.eql(0); | ||
expect(body.request_page_size).to.eql(10); | ||
expect(body.request_index).to.eql(0); | ||
}); | ||
}); | ||
|
||
describe('POST /api/endpoint/endpoints when index is not empty', () => { | ||
before(() => esArchiver.load('endpoint/endpoints')); | ||
after(() => esArchiver.unload('endpoint/endpoints')); | ||
it('endpoints api should return one entry for each endpoint with default paging', async () => { | ||
const { body } = await supertest | ||
.post('/api/endpoint/endpoints') | ||
|
@@ -46,6 +61,30 @@ export default function({ getService }: FtrProviderContext) { | |
expect(body.request_index).to.eql(1); | ||
}); | ||
|
||
/* test that when paging properties produces no result, the total should reflect the actual number of endpoints | ||
in the index. | ||
*/ | ||
it('endpoints api should return accurate total endpoints if page index produces no result', async () => { | ||
const { body } = await supertest | ||
.post('/api/endpoint/endpoints') | ||
.set('kbn-xsrf', 'xxx') | ||
.send({ | ||
paging_properties: [ | ||
{ | ||
page_size: 10, | ||
}, | ||
{ | ||
page_index: 3, | ||
}, | ||
], | ||
}) | ||
.expect(200); | ||
expect(body.total).to.eql(3); | ||
expect(body.endpoints.length).to.eql(0); | ||
expect(body.request_page_size).to.eql(10); | ||
expect(body.request_index).to.eql(30); | ||
}); | ||
|
||
it('endpoints api should return 400 when pagingProperties is below boundaries.', async () => { | ||
const { body } = await supertest | ||
.post('/api/endpoint/endpoints') | ||
|
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.
Would that work here?
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.
Yes, slipped me to use this shorthand. Thanks.