Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@walterra
walterra committed Aug 23, 2023
1 parent 3adfd4a commit 34998ea
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 19 deletions.
3 changes: 2 additions & 1 deletion x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ export const useDeleteIndexAndTargetIndex = (items: TransformListRow[]) => {
const toastNotifications = useToastNotifications();

const userCanDeleteDataView =
capabilities.savedObjectsManagement.delete === true || capabilities.indexPatterns.save === true;
(capabilities.savedObjectsManagement && capabilities.savedObjectsManagement.delete === true) ||
(capabilities.indexPatterns && capabilities.indexPatterns.save === true);

const [deleteDestIndex, setDeleteDestIndex] = useState<boolean>(true);
const [deleteDataView, setDeleteDataView] = useState<boolean>(userCanDeleteDataView);
Expand Down
8 changes: 0 additions & 8 deletions x-pack/test/api_integration/apis/transform/stop_transforms.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import expect from '@kbn/expect';

import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
import type { StopTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/stop_transforms';
import { isStopTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';

import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';

Expand Down Expand Up @@ -76,7 +75,6 @@ export default ({ getService }: FtrProviderContext) => {
.send(reqBody);
transform.api.assertResponseStatusCode(200, status, body);

expect(isStopTransformsResponseSchema(body)).to.eql(true);
expect(body[transformId].success).to.eql(true);
expect(typeof body[transformId].error).to.eql('undefined');
await transform.api.waitForTransformState(transformId, TRANSFORM_STATE.STOPPED);
Expand All @@ -97,7 +95,6 @@ export default ({ getService }: FtrProviderContext) => {
.send(reqBody);
transform.api.assertResponseStatusCode(200, status, body);

expect(isStopTransformsResponseSchema(body)).to.eql(true);
expect(body[transformId].success).to.eql(false);
expect(typeof body[transformId].error).to.eql('object');

Expand All @@ -121,7 +118,6 @@ export default ({ getService }: FtrProviderContext) => {
.send(reqBody);
transform.api.assertResponseStatusCode(200, status, body);

expect(isStopTransformsResponseSchema(body)).to.eql(true);
expect(body.invalid_transform_id.success).to.eql(false);
expect(body.invalid_transform_id).to.have.property('error');
});
Expand Down Expand Up @@ -158,8 +154,6 @@ export default ({ getService }: FtrProviderContext) => {
.send(reqBody);
transform.api.assertResponseStatusCode(200, status, body);

expect(isStopTransformsResponseSchema(body)).to.eql(true);

await asyncForEach(reqBody, async ({ id: transformId }: { id: string }, idx: number) => {
expect(body[transformId].success).to.eql(true);
await transform.api.waitForTransformState(transformId, TRANSFORM_STATE.STOPPED);
Expand All @@ -183,8 +177,6 @@ export default ({ getService }: FtrProviderContext) => {
]);
transform.api.assertResponseStatusCode(200, status, body);

expect(isStopTransformsResponseSchema(body)).to.eql(true);

await asyncForEach(reqBody, async ({ id: transformId }: { id: string }, idx: number) => {
expect(body[transformId].success).to.eql(true);
await transform.api.waitForTransformState(transformId, TRANSFORM_STATE.STOPPED);
Expand Down
5 changes: 0 additions & 5 deletions x-pack/test/api_integration/apis/transform/transforms.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import expect from '@kbn/expect';

import type { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
import { isGetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
import { getCommonRequestHeader } from '../../../functional/services/ml/common_api';
import { USER } from '../../../functional/services/transform/security_common';

Expand Down Expand Up @@ -43,8 +42,6 @@ export default ({ getService }: FtrProviderContext) => {
}

function assertTransformsResponseBody(body: GetTransformsResponseSchema) {
expect(isGetTransformsResponseSchema(body)).to.eql(true);

expect(body.count).to.eql(expected.apiTransformTransforms.count);
expect(body.transforms).to.have.length(expected.apiTransformTransforms.count);

Expand All @@ -62,8 +59,6 @@ export default ({ getService }: FtrProviderContext) => {
}

function assertSingleTransformResponseBody(body: GetTransformsResponseSchema) {
expect(isGetTransformsResponseSchema(body)).to.eql(true);

expect(body.count).to.eql(expected.apiTransformTransformsTransformId.count);
expect(body.transforms).to.have.length(expected.apiTransformTransformsTransformId.count);

Expand Down
3 changes: 0 additions & 3 deletions x-pack/test/api_integration/apis/transform/transforms_nodes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import expect from '@kbn/expect';

import type { GetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
import { isGetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
import { getCommonRequestHeader } from '../../../functional/services/ml/common_api';
import { USER } from '../../../functional/services/transform/security_common';

Expand All @@ -25,8 +24,6 @@ export default ({ getService }: FtrProviderContext) => {
};

function assertTransformsNodesResponseBody(body: GetTransformNodesResponseSchema) {
expect(isGetTransformNodesResponseSchema(body)).to.eql(true);

expect(body.count).to.not.be.lessThan(expected.apiTransformTransformsNodes.minCount);
}

Expand Down
2 changes: 0 additions & 2 deletions x-pack/test/api_integration/apis/transform/transforms_stats.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import expect from '@kbn/expect';

import type { GetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms_stats';
import { isGetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';

import { getCommonRequestHeader } from '../../../functional/services/ml/common_api';
Expand Down Expand Up @@ -39,7 +38,6 @@ export default ({ getService }: FtrProviderContext) => {
}

function assertTransformsStatsResponseBody(body: GetTransformsStatsResponseSchema) {
expect(isGetTransformsStatsResponseSchema(body)).to.eql(true);
expect(body.count).to.eql(expected.apiTransformTransforms.count);
expect(body.transforms).to.have.length(expected.apiTransformTransforms.count);

Expand Down

0 comments on commit 34998ea

Please sign in to comment.