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

[8.5] Ensure that API keys are rendered before performing bulk delete in functional tests. (#148013) (#148045)

Browse source 
# Backport

This will backport the following commits from `main` to `8.5`:
- [Ensure that API keys are rendered before performing bulk delete in
functional tests.
(#148013)](https://github.com/elastic/kibana/pull/148013)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Aleh
Zasypkin","email":"aleh.zasypkin@elastic.co"},"sourceCommit":{"committedDate":"2022-12-22T18:44:11Z","message":"Ensure
that API keys are rendered before performing bulk delete in functional
tests.
(#148013)","sha":"3a5f5626b2c3631eb2646782937171d2f87ce525","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["test","Team:Security","Feature:Users/Roles/API
Keys","release_note:skip","ci:no-auto-commit","backport:all-open","v8.7.0"],"number":148013,"url":"https://github.com/elastic/kibana/pull/148013","mergeCommit":{"message":"Ensure
that API keys are rendered before performing bulk delete in functional
tests.
(#148013)","sha":"3a5f5626b2c3631eb2646782937171d2f87ce525"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/148013","number":148013,"mergeCommit":{"message":"Ensure
that API keys are rendered before performing bulk delete in functional
tests. (#148013)","sha":"3a5f5626b2c3631eb2646782937171d2f87ce525"}}]}]
BACKPORT-->
This commit is contained in:
Aleh Zasypkin 2022-12-23 11:19:15 +01:00 • committed by GitHub
parent 755d695473
commit 2cd0d51e8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
View file

@ -481,6 +481,7 @@ export class APIKeysGridPage extends Component<Props, State> {
defaultMessage: 'Name',
}),
sortable: true,
'data-test-subj': 'apiKeyNameCell',
},
]);

15
x-pack/test/functional/apps/api_keys/home_page.ts
View file

@ -17,6 +17,17 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const testSubjects = getService('testSubjects');
const find = getService('find');
const browser = getService('browser');
const retry = getService('retry');
async function ensureApiKeysExist(apiKeysNames: string[]) {
await retry.try(async () => {
for (const apiKeyName of apiKeysNames) {
log.debug(`Checking if API key ("${apiKeyName}") exists.`);
await pageObjects.apiKeys.ensureApiKeyExists(apiKeyName);
log.debug(`API key ("${apiKeyName}") exists.`);
}
});
}
describe('Home page', function () {
before(async () => {
@ -109,6 +120,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.apiKeys.clickOnPromptCreateApiKey();
await pageObjects.apiKeys.setApiKeyName('api key 1');
await pageObjects.apiKeys.submitOnCreateApiKey();
await ensureApiKeysExist(['api key 1']);
});
it('one by one', async () => {
@ -123,6 +135,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.apiKeys.setApiKeyName('api key 2');
await pageObjects.apiKeys.submitOnCreateApiKey();
// Make sure all API keys we want to delete are created and rendered.
await ensureApiKeysExist(['api key 1', 'api key 2']);
await pageObjects.apiKeys.bulkDeleteApiKeys();
expect(await pageObjects.apiKeys.getApiKeysFirstPromptTitle()).to.be(
'Create your first API key'

11
x-pack/test/functional/page_objects/api_keys_page.ts
View file

@ -92,5 +92,16 @@ export function ApiKeysPageProvider({ getService }: FtrProviderContext) {
await testSubjects.click('confirmModalConfirmButton');
}
},
async ensureApiKeyExists(apiKeyName: string) {
const existingApiKeyNameCells = await testSubjects.findAll('apiKeyNameCell');
for (const existingApiKeyNameCell of existingApiKeyNameCells) {
if (apiKeyName === (await existingApiKeyNameCell.getVisibleText())) {
return;
}
}
throw new Error(`API key ("${apiKeyName}") does not exist.`);
},
};
}