Skip to content

Commit

Permalink
focus tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominiqueclarke
dominiqueclarke committed Aug 20, 2021
1 parent d155a94 commit a3fd487
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 69 deletions.
10 changes: 5 additions & 5 deletions x-pack/test/functional/apps/uptime/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
const server = getService('kibanaServer');
const uptime = getService('uptime');

describe('Uptime app', function () {
describe.only('Uptime app', function () {
this.tags('ciGroup6');

beforeEach('delete settings', async () => {
await deleteUptimeSettingsObject(server);
});

describe('with generated data', () => {
describe.only('with generated data', () => {
beforeEach('load heartbeat data', async () => {
await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank');
});
afterEach('unload', async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
});

loadTestFile(require.resolve('./locations'));
loadTestFile(require.resolve('./settings'));
loadTestFile(require.resolve('./certificates'));
// loadTestFile(require.resolve('./locations'));
// loadTestFile(require.resolve('./settings'));
// loadTestFile(require.resolve('./certificates'));
loadTestFile(require.resolve('./synthetics_integration'));
});

Expand Down
58 changes: 30 additions & 28 deletions x-pack/test/functional/apps/uptime/synthetics_integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const uptimeService = getService('uptime');

const getSyntheticsPolicy = (agentFullPolicy: FullAgentPolicy) =>
agentFullPolicy.inputs.find((input) => input.meta?.package?.name === 'synthetics');

const generatePolicy = ({
agentFullPolicy,
version,
Expand All @@ -32,7 +35,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
data_stream: {
namespace: 'default',
},
id: agentFullPolicy.inputs[0].id,
id: getSyntheticsPolicy(agentFullPolicy).id,
meta: {
package: {
name: 'synthetics',
Expand Down Expand Up @@ -74,7 +77,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
use_output: 'default',
});

describe('When on the Synthetics Integration Policy Create Page', function () {
describe.only('When on the Synthetics Integration Policy Create Page', function () {
this.tags(['ciGroup6']);
const basicConfig = {
name: monitorName,
Expand All @@ -93,7 +96,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});

// FLAKY: https://github.com/elastic/kibana/issues/109260
describe.skip('displays custom UI', () => {
describe('displays custom UI', () => {
before(async () => {
const version = await uptimeService.syntheticsPackage.getSyntheticsPackageVersion();
await uptimePage.syntheticsIntegration.navigateToPackagePage(version!);
Expand All @@ -112,11 +115,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});

// FLAKY: https://github.com/elastic/kibana/issues/109329
describe.skip('create new policy', () => {
describe('create new policy', () => {
let version: string;
before(async () => {
await uptimeService.syntheticsPackage.deletePolicyByName('system-1');
});

beforeEach(async () => {
version = (await uptimeService.syntheticsPackage.getSyntheticsPackageVersion())!;
Expand All @@ -143,7 +143,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -160,8 +160,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
tags: [config.tags],
'check.request.method': 'GET',
},
}),
]);
})
);
});

it('allows enabling tls with defaults', async () => {
Expand All @@ -181,7 +181,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(
agentFullPolicy.inputs.find((input) => input.meta?.package?.name === 'synthetics')
).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -200,8 +202,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
'service.name': config.apmServiceName,
tags: [config.tags],
},
}),
]);
})
);
});

it('allows configuring tls', async () => {
Expand All @@ -228,7 +230,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -251,8 +253,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
'service.name': config.apmServiceName,
tags: [config.tags],
},
}),
]);
})
);
});

it('allows configuring http advanced options', async () => {
Expand Down Expand Up @@ -295,7 +297,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand Down Expand Up @@ -324,8 +326,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
'service.name': config.apmServiceName,
tags: [config.tags],
},
}),
]);
})
);
});

it('allows saving tcp monitor when user enters a valid integration name and host+port', async () => {
Expand All @@ -344,7 +346,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -358,8 +360,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
tags: [config.tags],
'service.name': config.apmServiceName,
},
}),
]);
})
);
});

it('allows configuring tcp advanced options', async () => {
Expand All @@ -385,7 +387,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -402,8 +404,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
'service.name': config.apmServiceName,
tags: [config.tags],
},
}),
]);
})
);
});

it('allows saving icmp monitor when user enters a valid integration name and host', async () => {
Expand All @@ -422,7 +424,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
agentPolicyId
);

expect(agentFullPolicy.inputs).to.eql([
expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
generatePolicy({
agentFullPolicy,
version,
Expand All @@ -436,8 +438,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
'service.name': config.apmServiceName,
tags: [config.tags],
},
}),
]);
})
);
});
});
});
Expand Down
72 changes: 36 additions & 36 deletions x-pack/test/functional/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,44 @@ export default async function ({ readConfigFile }) {
return {
// list paths to the files that contain your plugins tests
testFiles: [
resolve(__dirname, './apps/advanced_settings'),
resolve(__dirname, './apps/canvas'),
resolve(__dirname, './apps/graph'),
resolve(__dirname, './apps/monitoring'),
resolve(__dirname, './apps/watcher'),
resolve(__dirname, './apps/dashboard'),
resolve(__dirname, './apps/dashboard_mode'),
resolve(__dirname, './apps/discover'),
// resolve(__dirname, './apps/advanced_settings'),
// resolve(__dirname, './apps/canvas'),
// resolve(__dirname, './apps/graph'),
// resolve(__dirname, './apps/monitoring'),
// resolve(__dirname, './apps/watcher'),
// resolve(__dirname, './apps/dashboard'),
// resolve(__dirname, './apps/dashboard_mode'),
// resolve(__dirname, './apps/discover'),
resolve(__dirname, './apps/security'),
resolve(__dirname, './apps/spaces'),
resolve(__dirname, './apps/lens'),
resolve(__dirname, './apps/logstash'),
resolve(__dirname, './apps/grok_debugger'),
resolve(__dirname, './apps/infra'),
resolve(__dirname, './apps/ml'),
resolve(__dirname, './apps/rollup_job'),
resolve(__dirname, './apps/maps'),
resolve(__dirname, './apps/status_page'),
resolve(__dirname, './apps/timelion'),
resolve(__dirname, './apps/upgrade_assistant'),
resolve(__dirname, './apps/visualize'),
// resolve(__dirname, './apps/spaces'),
// resolve(__dirname, './apps/lens'),
// resolve(__dirname, './apps/logstash'),
// resolve(__dirname, './apps/grok_debugger'),
// resolve(__dirname, './apps/infra'),
// resolve(__dirname, './apps/ml'),
// resolve(__dirname, './apps/rollup_job'),
// resolve(__dirname, './apps/maps'),
// resolve(__dirname, './apps/status_page'),
// resolve(__dirname, './apps/timelion'),
// resolve(__dirname, './apps/upgrade_assistant'),
// resolve(__dirname, './apps/visualize'),
resolve(__dirname, './apps/uptime'),
resolve(__dirname, './apps/saved_objects_management'),
resolve(__dirname, './apps/dev_tools'),
resolve(__dirname, './apps/apm'),
resolve(__dirname, './apps/api_keys'),
resolve(__dirname, './apps/index_patterns'),
resolve(__dirname, './apps/index_management'),
resolve(__dirname, './apps/index_lifecycle_management'),
resolve(__dirname, './apps/ingest_pipelines'),
resolve(__dirname, './apps/snapshot_restore'),
resolve(__dirname, './apps/cross_cluster_replication'),
resolve(__dirname, './apps/remote_clusters'),
resolve(__dirname, './apps/transform'),
resolve(__dirname, './apps/reporting_management'),
resolve(__dirname, './apps/management'),
resolve(__dirname, './apps/reporting'),
resolve(__dirname, './apps/observability'),
// resolve(__dirname, './apps/saved_objects_management'),
// resolve(__dirname, './apps/dev_tools'),
// resolve(__dirname, './apps/apm'),
// resolve(__dirname, './apps/api_keys'),
// resolve(__dirname, './apps/index_patterns'),
// resolve(__dirname, './apps/index_management'),
// resolve(__dirname, './apps/index_lifecycle_management'),
// resolve(__dirname, './apps/ingest_pipelines'),
// resolve(__dirname, './apps/snapshot_restore'),
// resolve(__dirname, './apps/cross_cluster_replication'),
// resolve(__dirname, './apps/remote_clusters'),
// resolve(__dirname, './apps/transform'),
// resolve(__dirname, './apps/reporting_management'),
// resolve(__dirname, './apps/management'),
// resolve(__dirname, './apps/reporting'),
// resolve(__dirname, './apps/observability'),

// This license_management file must be last because it is destructive.
resolve(__dirname, './apps/license_management'),
Expand Down

0 comments on commit a3fd487

Please sign in to comment.