From 61ed8e4dcb85b2c80b2fde5412e70a02eadc9572 Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter@elastic.co>
Date: Thu, 20 Jan 2022 17:03:42 +0100
Subject: [PATCH] [ML] Improve functional tests.

---
 .../edit_transform_flyout_form.tsx                    |  4 +++-
 x-pack/test/functional/apps/transform/editing.ts      | 11 +++++++++++
 .../test/functional/services/transform/edit_flyout.ts |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
index ec0d0640d5435c..a0e178d25a86e0 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
@@ -55,7 +55,9 @@ export const EditTransformFlyoutForm: FC<EditTransformFlyoutFormProps> = ({
   );
 
   const retentionDateFieldOptions = useMemo(() => {
-    return Array.isArray(dateFieldNames) ? dateFieldNames.map((text: string) => ({ text })) : [];
+    return Array.isArray(dateFieldNames)
+      ? dateFieldNames.map((text: string) => ({ text, value: text }))
+      : [];
   }, [dateFieldNames]);
 
   return (
diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts
index a32fc7cc00e4fb..154c91ef6c149a 100644
--- a/x-pack/test/functional/apps/transform/editing.ts
+++ b/x-pack/test/functional/apps/transform/editing.ts
@@ -51,6 +51,8 @@ export default function ({ getService }: FtrProviderContext) {
         transformDescription: 'updated description',
         transformDocsPerSecond: '1000',
         transformFrequency: '10m',
+        transformRetentionPolicyField: 'order_date',
+        transformRetentionPolicyMaxAge: '1d',
         expected: {
           messageText: 'updated transform.',
           retentionPolicy: {
@@ -71,6 +73,8 @@ export default function ({ getService }: FtrProviderContext) {
         transformDescription: 'updated description',
         transformDocsPerSecond: '1000',
         transformFrequency: '10m',
+        transformRetentionPolicyField: 'order_date',
+        transformRetentionPolicyMaxAge: '1d',
         expected: {
           messageText: 'updated transform.',
           retentionPolicy: {
@@ -154,6 +158,9 @@ export default function ({ getService }: FtrProviderContext) {
           await transform.editFlyout.assertTransformEditFlyoutRetentionPolicyFieldSelectValue(
             testData.expected.retentionPolicy.field
           );
+          await transform.editFlyout.setTransformEditFlyoutRetentionPolicyFieldSelectValue(
+            testData.transformRetentionPolicyField
+          );
 
           await transform.editFlyout.assertTransformEditFlyoutInputEnabled(
             'RetentionPolicyMaxAge',
@@ -163,6 +170,10 @@ export default function ({ getService }: FtrProviderContext) {
             'RetentionPolicyMaxAge',
             testData.expected.retentionPolicy.maxAge
           );
+          await transform.editFlyout.setTransformEditFlyoutInputValue(
+            'RetentionPolicyMaxAge',
+            testData.transformRetentionPolicyMaxAge
+          );
         });
 
         it('updates the transform and displays it correctly in the job list', async () => {
diff --git a/x-pack/test/functional/services/transform/edit_flyout.ts b/x-pack/test/functional/services/transform/edit_flyout.ts
index 6a2442130bce84..10e90411b135fb 100644
--- a/x-pack/test/functional/services/transform/edit_flyout.ts
+++ b/x-pack/test/functional/services/transform/edit_flyout.ts
@@ -62,7 +62,7 @@ export function TransformEditFlyoutProvider({ getService }: FtrProviderContext)
       );
       expect(actualValue).to.eql(
         expectedValue,
-        `Detector input option value should be '${expectedValue}' (got '${actualValue}')`
+        `Retention policy field option value should be '${expectedValue}' (got '${actualValue}')`
       );
     },