Skip to content

Commit 7304780

Browse files
jgowdyelasticjgowdyelastic
committed
re-enabling tests
1 parent ab143b6 commit 7304780

File tree

11 files changed

+61
-53
lines changed

11 files changed

+61
-53
lines changed

‎x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ export const FilebeatConfigFlyout: FC<Props> = ({
7373
<EuiFlyoutFooter>
7474
<EuiFlexGroup justifyContent="spaceBetween">
7575
<EuiFlexItem grow={false}>
76-
<EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
76+
<EuiButtonEmpty
77+
iconType="cross"
78+
onClick={closeFlyout}
79+
flush="left"
80+
data-test-subj="fileBeatConfigFlyoutCloseButton"
81+
>
7782
<FormattedMessage
7883
id="xpack.dataVisualizer.fileBeatConfigFlyout.closeButton"
7984
defaultMessage="Close"

‎x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export interface ResultLink {
2828
description: string;
2929
getUrl(params?: any): Promise<string>;
3030
canDisplay(params?: any): Promise<boolean>;
31+
dataTestSubj?: string;
3132
}
3233

3334
interface Props {

‎x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ interface Props {
2727
additionalLinks: ResultLink[];
2828
}
2929

30-
// @todo: Add back create job card in a follow up PR
3130
export const ActionsPanel: FC<Props> = ({
3231
indexPattern,
3332
searchString,
@@ -130,7 +129,7 @@ export const ActionsPanel: FC<Props> = ({
130129
icon={link.icon}
131130
description={link.description}
132131
title={link.title}
133-
// data-test-subj="dataVisualizerViewInDiscoverCard"
132+
data-test-subj={link.dataTestSubj}
134133
/>
135134
<EuiSpacer size="m" />
136135
</>

‎x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export const IndexDataVisualizerPage: FC = () => {
6969
canDisplay: async () => {
7070
return isFullLicense() && checkPermission('canCreateJob') && mlNodesAvailable();
7171
},
72+
dataTestSubj: 'dataVisualizerCreateAdvancedJobCard',
7273
},
7374
{
7475
id: 'create_ml_dfa_job',
@@ -97,6 +98,7 @@ export const IndexDataVisualizerPage: FC = () => {
9798
isFullLicense() && checkPermission('canCreateDataFrameAnalytics') && mlNodesAvailable()
9899
);
99100
},
101+
dataTestSubj: 'dataVisualizerCreateDataFrameAnalyticsCard',
100102
},
101103
],
102104
[]

‎x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ export default function ({ getService }: FtrProviderContext) {
273273

274274
await ml.testExecution.logTestStep('creates filebeat config');
275275
await ml.dataVisualizerFileBased.selectCreateFilebeatConfig();
276+
277+
await ml.testExecution.logTestStep('closes filebeat config');
278+
await ml.dataVisualizerFileBased.closeCreateFilebeatConfig();
276279
});
277280
});
278281
}

‎x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@ export default function ({ getService }: FtrProviderContext) {
1515
this.tags(['mlqa']);
1616

1717
const indexPatternName = 'ft_farequote';
18-
// @TODO: Re-enable in follow up
19-
// const advancedJobWizardDatafeedQuery = `{
20-
// "bool": {
21-
// "must": [
22-
// {
23-
// "match_all": {}
24-
// }
25-
// ]
26-
// }
27-
// }`; // Note query is not currently passed to the wizard
18+
19+
const advancedJobWizardDatafeedQuery = JSON.stringify(
20+
{
21+
bool: {
22+
must: [
23+
{
24+
match_all: {},
25+
},
26+
],
27+
},
28+
},
29+
null,
30+
2
31+
);
32+
// Note query is not currently passed to the wizard
2833

2934
before(async () => {
3035
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
@@ -48,20 +53,19 @@ export default function ({ getService }: FtrProviderContext) {
4853
await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(indexPatternName);
4954
});
5055

51-
// @TODO: Re-enable in follow up
52-
// it('opens the advanced job wizard', async () => {
53-
// await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
54-
// await ml.dataVisualizerIndexBased.assertActionsPanelExists();
55-
// await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
56-
// await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
57-
//
58-
// // Note the search is not currently passed to the wizard, just the index.
59-
// await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
60-
// await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton();
61-
// await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
62-
// await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
63-
// await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery);
64-
// });
56+
it('opens the advanced job wizard', async () => {
57+
await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
58+
await ml.dataVisualizerIndexBased.assertActionsPanelExists();
59+
await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
60+
await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
61+
62+
// Note the search is not currently passed to the wizard, just the index.
63+
await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
64+
await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton();
65+
await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
66+
await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
67+
await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery);
68+
});
6569
});
6670

6771
describe('view in discover page action', function () {

‎x-pack/test/functional/apps/ml/permissions/full_ml_access.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ export default function ({ getService }: FtrProviderContext) {
9393

9494
const ecIndexPattern = 'ft_module_sample_ecommerce';
9595
const ecExpectedTotalCount = '287';
96-
// @TODO: Re-enable in follow up
97-
// const ecExpectedModuleId = 'sample_data_ecommerce';
96+
97+
const ecExpectedModuleId = 'sample_data_ecommerce';
9898

9999
const uploadFilePath = path.join(
100100
__dirname,
@@ -365,11 +365,10 @@ export default function ({ getService }: FtrProviderContext) {
365365
}
366366
await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
367367

368-
// @TODO: Re-enable in follow up
369-
// await ml.testExecution.logTestStep('should display job cards');
370-
// await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
371-
// await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId);
372-
// await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
368+
await ml.testExecution.logTestStep('should display job cards');
369+
await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
370+
await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId);
371+
await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
373372
});
374373

375374
it('should display elements on File Data Visualizer page correctly', async () => {

‎x-pack/test/functional/apps/ml/permissions/read_ml_access.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ export default function ({ getService }: FtrProviderContext) {
9494

9595
const ecIndexPattern = 'ft_module_sample_ecommerce';
9696
const ecExpectedTotalCount = '287';
97-
// const ecExpectedModuleId = 'sample_data_ecommerce';
9897

9998
const uploadFilePath = path.join(
10099
__dirname,
@@ -357,11 +356,9 @@ export default function ({ getService }: FtrProviderContext) {
357356
}
358357
await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
359358

360-
// @TODO: Re-enable in follow up
361-
// await ml.testExecution.logTestStep('should not display job cards');
362-
// await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
363-
// await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
364-
// await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
359+
await ml.testExecution.logTestStep('should not display job cards');
360+
await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
361+
await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
365362
});
366363

367364
it('should display elements on File Data Visualizer page correctly', async () => {

‎x-pack/test/functional/services/ml/data_visualizer_file_based.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,10 @@ export function MachineLearningDataVisualizerFileBasedProvider(
139139
await testSubjects.click('fileDataVisFilebeatConfigLink');
140140
await testSubjects.existOrFail('fileDataVisFilebeatConfigPanel');
141141
},
142+
143+
async closeCreateFilebeatConfig() {
144+
await testSubjects.click('fileBeatConfigFlyoutCloseButton');
145+
await testSubjects.missingOrFail('fileDataVisFilebeatConfigPanel');
146+
},
142147
};
143148
}

‎x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export default function ({ getService }: FtrProviderContext) {
2525
describe(`(${testUser.user})`, function () {
2626
const ecIndexPattern = 'ft_module_sample_ecommerce';
2727
const ecExpectedTotalCount = '287';
28-
// const ecExpectedModuleId = 'sample_data_ecommerce';
2928

3029
const uploadFilePath = path.join(
3130
__dirname,
@@ -134,11 +133,9 @@ export default function ({ getService }: FtrProviderContext) {
134133
}
135134
await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
136135

137-
// @TODO: Re-enable in follow up
138-
// await ml.testExecution.logTestStep('should not display job cards');
139-
// await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
140-
// await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
141-
// await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
136+
await ml.testExecution.logTestStep('should not display job cards');
137+
await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
138+
await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
142139
});
143140

144141
it('should display elements on File Data Visualizer page correctly', async () => {

0 commit comments

Comments
 (0)