Rename to assertions

elastic · Feb 14, 2023 · 10d9917 · 10d9917
1 parent 27323ff
commit 10d9917
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 24 deletions.
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
@@ -158,7 +158,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of testData.fieldStatsEntries.filter(
             (e) => e.isDependentVariableInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
               fieldName,
               fieldType
             );

diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts
@@ -330,7 +330,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
             (e) => e.isDependentVariableInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
               fieldName,
               fieldType
             );
@@ -363,7 +363,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
             (e) => e.isIncludeFieldInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
               fieldName,
               fieldType
             );

diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
@@ -184,7 +184,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
             (e) => e.isIncludeFieldInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
               fieldName,
               fieldType
             );

diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
@@ -155,7 +155,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
             (e) => e.isDependentVariableInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickDependentVariableInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
               fieldName,
               fieldType
             );
@@ -178,7 +178,7 @@ export default function ({ getService }: FtrProviderContext) {
           for (const { fieldName, type: fieldType } of fieldStatsEntries.filter(
             (e) => e.isIncludeFieldInput
           )) {
-            await ml.dataFrameAnalyticsCreation.clickIncludeFieldsInputFieldStatTrigger(
+            await ml.dataFrameAnalyticsCreation.assertFieldStatFlyoutContentFromIncludeFieldTrigger(
               fieldName,
               fieldType
             );

diff --git a/x-pack/test/functional/apps/transform/creation/index_pattern/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation/index_pattern/creation_index_pattern.ts
@@ -606,7 +606,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
               : [];
 
             for (const { fieldName, type } of groupByFieldStatsEntries) {
-              await transform.wizard.clickGroupByInputFieldStatTrigger(fieldName, type);
+              await transform.wizard.assertFieldStatFlyoutContentFromGroupByInputTrigger(
+                fieldName,
+                type
+              );
             }
 
             for (const [index, entry] of testData.groupByEntries.entries()) {
@@ -626,7 +629,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
               : [];
 
             for (const { fieldName, type } of aggInputFieldStatsEntries) {
-              await transform.wizard.clickAggInputFieldStatTrigger(fieldName, type);
+              await transform.wizard.assertFieldStatFlyoutContentFromAggInputTrigger(
+                fieldName,
+                type
+              );
             }
 
             await transform.testExecution.logTestStep('adds the aggregation entries');
@@ -655,7 +661,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
               : [];
 
             for (const { fieldName, type } of uniqueKeyInputFieldStatsEntries) {
-              await transform.wizard.clickUniqueKeysInputFieldStatTrigger(fieldName, type);
+              await transform.wizard.assertFieldStatsFlyoutContentFromUniqueKeysInputTrigger(
+                fieldName,
+                type
+              );
             }
 
             await transform.testExecution.logTestStep('adds unique keys');
@@ -673,7 +682,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
               : [];
 
             for (const { fieldName, type } of sortFieldInputFieldStatsEntries) {
-              await transform.wizard.clickSortFieldInputFieldStatTrigger(fieldName, type);
+              await transform.wizard.assertFieldStatFlyoutContentFromSortFieldInputTrigger(
+                fieldName,
+                type
+              );
             }
 
             await transform.testExecution.logTestStep('sets the sort field');

diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -204,11 +204,11 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
       });
     },
 
-    async clickIncludeFieldsInputFieldStatTrigger(
+    async assertFieldStatFlyoutContentFromIncludeFieldTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await mlFieldStatsFlyout.clickFieldStatTrigger(
+      await mlFieldStatsFlyout.assertFieldStatFlyoutContentFromTrigger(
         'mlAnalyticsCreateJobWizardIncludesSelect',
         fieldName,
         fieldType
@@ -268,11 +268,11 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
       });
     },
 
-    async clickDependentVariableInputFieldStatTrigger(
+    async assertFieldStatsFlyoutContentFromDependentVariableInputTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await mlFieldStatsFlyout.clickFieldStatComboBoxTrigger(
+      await mlFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
         'mlAnalyticsCreateJobWizardDependentVariableSelect loaded',
         fieldName,
         fieldType

diff --git a/x-pack/test/functional/services/ml/field_stats_flyout.ts b/x-pack/test/functional/services/ml/field_stats_flyout.ts
@@ -62,7 +62,7 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
       });
     },
 
-    async clickFieldStatTrigger(
+    async assertFieldStatFlyoutContentFromTrigger(
       testSubj: string,
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
@@ -76,8 +76,10 @@ export function MachineLearningFieldStatsFlyoutProvider({ getService }: FtrProvi
         await testSubjects.existOrFail(`mlFieldStatsFlyoutContent ${fieldName}-title`);
       });
       await this.assertFieldStatContentByType(testSubj, fieldName, fieldType);
+      await this.ensureFieldStatsFlyoutClosed();
     },
-    async clickFieldStatComboBoxTrigger(
+
+    async assertFieldStatFlyoutContentFromComboBoxTrigger(
       parentComboBoxSelector: string,
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'

diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts
@@ -378,11 +378,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
       await this.assertSelectedTransformFunction(transformFunction);
     },
 
-    async clickUniqueKeysInputFieldStatTrigger(
+    async assertFieldStatsFlyoutContentFromUniqueKeysInputTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
+      await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
         'transformWizardUniqueKeysSelector',
         fieldName,
         fieldType
@@ -416,11 +416,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
       ]);
     },
 
-    async clickSortFieldInputFieldStatTrigger(
+    async assertFieldStatFlyoutContentFromSortFieldInputTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
+      await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
         'transformWizardSortFieldSelector',
         fieldName,
         fieldType
@@ -448,11 +448,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
       await this.assertSortFieldInputValue(identificator);
     },
 
-    async clickGroupByInputFieldStatTrigger(
+    async assertFieldStatFlyoutContentFromGroupByInputTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
+      await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
         'transformGroupBySelection',
         fieldName,
         fieldType
@@ -518,11 +518,11 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
       } > comboBoxInput`;
     },
 
-    async clickAggInputFieldStatTrigger(
+    async assertFieldStatFlyoutContentFromAggInputTrigger(
       fieldName: string,
       fieldType?: 'keyword' | 'date' | 'number'
     ) {
-      await ml.commonFieldStatsFlyout.clickFieldStatComboBoxTrigger(
+      await ml.commonFieldStatsFlyout.assertFieldStatFlyoutContentFromComboBoxTrigger(
         'transformAggregationSelection',
         fieldName,
         fieldType