github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removing esArchiver from bulkCreate (#142676)

Browse source
This commit is contained in:
Kurt 2022-10-05 07:56:49 -04:00 • committed by GitHub
parent 93942280ab
commit 035a4337e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
View file

@ -6,7 +6,6 @@
*/
import expect from '@kbn/expect';
import { SuperTest } from 'supertest';
import { SavedObjectsErrorHelpers } from '@kbn/core/server';
import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
import { SPACES, ALL_SPACES_ID } from '../lib/spaces';
@ -17,6 +16,8 @@ import {
getRedactedNamespaces,
} from '../lib/saved_object_test_utils';
import { ExpectResponseBody, TestCase, TestDefinition, TestSuite, TestUser } from '../lib/types';
import { FtrProviderContext } from '../ftr_provider_context';
import { getTestDataLoader, SPACE_1, SPACE_2 } from '../../../common/lib/test_data_loader';
const {
DEFAULT: { spaceId: DEFAULT_SPACE_ID },
@ -85,7 +86,10 @@ const createRequest = ({ type, id, initialNamespaces }: BulkCreateTestCase) => (
...(initialNamespaces && { initialNamespaces }),
});
export function bulkCreateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
export function bulkCreateTestSuiteFactory(context: FtrProviderContext) {
const testDataLoader = getTestDataLoader(context);
const supertest = context.getService('supertestWithoutAuth');
const expectSavedObjectForbidden = expectResponses.forbiddenTypes('bulk_create');
const expectResponseBody =
(
@ -193,16 +197,31 @@ export function bulkCreateTestSuiteFactory(esArchiver: any, supertest: SuperTest
const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
describeFn(description, () => {
before(() =>
esArchiver.load(
'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
after(() =>
esArchiver.unload(
'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
)
);
before(async () => {
await testDataLoader.createFtrSpaces();
await testDataLoader.createFtrSavedObjectsData([
{
spaceName: null,
dataUrl:
'x-pack/test/saved_object_api_integration/common/fixtures/kbn_archiver/default_space.json',
},
{
spaceName: SPACE_1.id,
dataUrl:
'x-pack/test/saved_object_api_integration/common/fixtures/kbn_archiver/space_1.json',
},
{
spaceName: SPACE_2.id,
dataUrl:
'x-pack/test/saved_object_api_integration/common/fixtures/kbn_archiver/space_2.json',
},
]);
});
after(async () => {
await testDataLoader.deleteFtrSpaces();
await testDataLoader.deleteFtrSavedObjectsData();
});
const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };

7
x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
View file

@ -113,12 +113,9 @@ const createTestCases = (overwrite: boolean, spaceId: string) => {
return { normalTypes, crossNamespace, hiddenType, allTypes };
};
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertestWithoutAuth');
const esArchiver = getService('esArchiver');
export default function (context: FtrProviderContext) {
const { addTests, createTestDefinitions, expectSavedObjectForbidden } =
bulkCreateTestSuiteFactory(esArchiver, supertest);
bulkCreateTestSuiteFactory(context);
const createTests = (overwrite: boolean, spaceId: string, user: TestUser) => {
const { normalTypes, crossNamespace, hiddenType, allTypes } = createTestCases(
overwrite,

7
x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
View file

@ -103,11 +103,8 @@ const createTestCases = (overwrite: boolean, spaceId: string) => {
];
};
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const { addTests, createTestDefinitions } = bulkCreateTestSuiteFactory(esArchiver, supertest);
export default function (context: FtrProviderContext) {
const { addTests, createTestDefinitions } = bulkCreateTestSuiteFactory(context);
const createTests = (overwrite: boolean, spaceId: string) => {
const testCases = createTestCases(overwrite, spaceId);
return createTestDefinitions(testCases, false, overwrite, {