update functional tests

elastic · Aug 16, 2021 · 5bb656e · 5bb656e
1 parent a30a25b
commit 5bb656e
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 82 deletions.
diff --git a/...ransform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx b/...ransform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
@@ -26,47 +26,50 @@ export const AdvancedRuntimeMappingsEditor: FC<StepDefineFormHook['runtimeMappin
     state: { advancedEditorRuntimeMappingsLastApplied, advancedRuntimeMappingsConfig, xJsonMode },
   }) => {
     return (
-      <CodeEditor
-        data-test-subj="transformAdvancedRuntimeMappingsEditor"
-        height={250}
-        languageId={'json'}
-        onChange={(d: string) => {
-          setAdvancedRuntimeMappingsConfig(d);
+      <div data-test-subj="transformAdvancedRuntimeMappingsEditor">
+        <CodeEditor
+          height={250}
+          languageId={'json'}
+          onChange={(d: string) => {
+            setAdvancedRuntimeMappingsConfig(d);
 
-          // Disable the "Apply"-Button if the config hasn't changed.
-          if (advancedEditorRuntimeMappingsLastApplied === d) {
-            setRuntimeMappingsEditorApplyButtonEnabled(false);
-            return;
-          }
+            // Disable the "Apply"-Button if the config hasn't changed.
+            if (advancedEditorRuntimeMappingsLastApplied === d) {
+              setRuntimeMappingsEditorApplyButtonEnabled(false);
+              return;
+            }
 
-          // Try to parse the string passed on from the editor.
-          // If parsing fails, the "Apply"-Button will be disabled
-          try {
-            // if the user deletes the json in the editor
-            // they should still be able to apply changes
-            const isEmptyStr = d === '';
-            const parsedJson = isEmptyStr ? {} : JSON.parse(convertToJson(d));
-            setRuntimeMappingsEditorApplyButtonEnabled(isEmptyStr || isRuntimeMappings(parsedJson));
-          } catch (e) {
-            setRuntimeMappingsEditorApplyButtonEnabled(false);
-          }
-        }}
-        options={{
-          ariaLabel: i18n.translate('xpack.transform.stepDefineForm.advancedEditorAriaLabel', {
-            defaultMessage: 'Advanced pivot editor',
-          }),
-          automaticLayout: true,
-          fontSize: 12,
-          scrollBeyondLastLine: false,
-          quickSuggestions: true,
-          minimap: {
-            enabled: false,
-          },
-          wordWrap: 'on',
-          wrappingIndent: 'indent',
-        }}
-        value={advancedRuntimeMappingsConfig}
-      />
+            // Try to parse the string passed on from the editor.
+            // If parsing fails, the "Apply"-Button will be disabled
+            try {
+              // if the user deletes the json in the editor
+              // they should still be able to apply changes
+              const isEmptyStr = d === '';
+              const parsedJson = isEmptyStr ? {} : JSON.parse(convertToJson(d));
+              setRuntimeMappingsEditorApplyButtonEnabled(
+                isEmptyStr || isRuntimeMappings(parsedJson)
+              );
+            } catch (e) {
+              setRuntimeMappingsEditorApplyButtonEnabled(false);
+            }
+          }}
+          options={{
+            ariaLabel: i18n.translate('xpack.transform.stepDefineForm.advancedEditorAriaLabel', {
+              defaultMessage: 'Advanced pivot editor',
+            }),
+            automaticLayout: true,
+            fontSize: 12,
+            scrollBeyondLastLine: false,
+            quickSuggestions: true,
+            minimap: {
+              enabled: false,
+            },
+            wordWrap: 'on',
+            wrappingIndent: 'indent',
+          }}
+          value={advancedRuntimeMappingsConfig}
+        />
+      </div>
     );
   },
   (prevProps, nextProps) => isEqual(pickProps(prevProps), pickProps(nextProps))

diff --git a/...pp/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx b/...pp/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
@@ -23,44 +23,48 @@ export const AdvancedSourceEditor: FC<StepDefineFormHook> = ({
   },
 }) => {
   return (
-    <CodeEditor
-      data-test-subj="transformAdvancedRuntimeMappingsEditor"
-      height={250}
-      languageId={'json'}
-      onChange={(d: string) => {
-        setSearchString(undefined);
-        setAdvancedEditorSourceConfig(d);
+    <div data-test-subj="transformAdvancedRuntimeMappingsEditor">
+      <CodeEditor
+        height={250}
+        languageId={'json'}
+        onChange={(d: string) => {
+          setSearchString(undefined);
+          setAdvancedEditorSourceConfig(d);
 
-        // Disable the "Apply"-Button if the config hasn't changed.
-        if (advancedEditorSourceConfigLastApplied === d) {
-          setAdvancedSourceEditorApplyButtonEnabled(false);
-          return;
-        }
+          // Disable the "Apply"-Button if the config hasn't changed.
+          if (advancedEditorSourceConfigLastApplied === d) {
+            setAdvancedSourceEditorApplyButtonEnabled(false);
+            return;
+          }
 
-        // Try to parse the string passed on from the editor.
-        // If parsing fails, the "Apply"-Button will be disabled
-        try {
-          JSON.parse(d);
-          setAdvancedSourceEditorApplyButtonEnabled(true);
-        } catch (e) {
-          setAdvancedSourceEditorApplyButtonEnabled(false);
-        }
-      }}
-      options={{
-        ariaLabel: i18n.translate('xpack.transform.stepDefineForm.advancedSourceEditorAriaLabel', {
-          defaultMessage: 'Advanced query editor',
-        }),
-        automaticLayout: true,
-        fontSize: 12,
-        scrollBeyondLastLine: false,
-        quickSuggestions: true,
-        minimap: {
-          enabled: false,
-        },
-        wordWrap: 'on',
-        wrappingIndent: 'indent',
-      }}
-      value={advancedEditorSourceConfig}
-    />
+          // Try to parse the string passed on from the editor.
+          // If parsing fails, the "Apply"-Button will be disabled
+          try {
+            JSON.parse(d);
+            setAdvancedSourceEditorApplyButtonEnabled(true);
+          } catch (e) {
+            setAdvancedSourceEditorApplyButtonEnabled(false);
+          }
+        }}
+        options={{
+          ariaLabel: i18n.translate(
+            'xpack.transform.stepDefineForm.advancedSourceEditorAriaLabel',
+            {
+              defaultMessage: 'Advanced query editor',
+            }
+          ),
+          automaticLayout: true,
+          fontSize: 12,
+          scrollBeyondLastLine: false,
+          quickSuggestions: true,
+          minimap: {
+            enabled: false,
+          },
+          wordWrap: 'on',
+          wrappingIndent: 'indent',
+        }}
+        value={advancedEditorSourceConfig}
+      />
+    </div>
   );
 };
diff --git a/...ansform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx b/...ansform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
@@ -328,7 +328,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
       {isUnsupportedAgg && (
         <EuiCodeBlock
           aria-label={i18n.translate('xpack.transform.agg.popoverForm.codeBlock', {
-            defaultMessage: 'Read only code editor',
+            defaultMessage: 'JSON of transform aggregation',
           })}
           fontSize="s"
           language="json"

diff --git a/.../transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx b/.../transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx
@@ -300,7 +300,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
           <EuiSpacer size="m" />
           <EuiCodeBlock
             aria-label={i18n.translate('xpack.transform.agg.popoverForm.codeBlock', {
-              defaultMessage: 'Read only code editor',
+              defaultMessage: 'JSON of transform aggregation',
             })}
             fontSize="s"
             language="json"

diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts
@@ -385,9 +385,9 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
     async assertRuntimeMappingsEditorContent(expectedContent: string[]) {
       await this.assertRuntimeMappingsEditorExists();
 
-      const runtimeMappingsEditorString = await aceEditor.getValue(
-        'transformAdvancedRuntimeMappingsEditor'
-      );
+      const wrapper = await testSubjects.find('transformAdvancedRuntimeMappingsEditor');
+      const editor = await wrapper.findByCssSelector('.monaco-editor .view-lines');
+      const runtimeMappingsEditorString = await editor.getVisibleText();
       // Not all lines may be visible in the editor and thus aceEditor may not return all lines.
       // This means we might not get back valid JSON so we only test against the first few lines
       // and see if the string matches.
@@ -624,7 +624,9 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
     },
 
     async assertAdvancedPivotEditorContent(expectedValue: string[]) {
-      const advancedEditorString = await aceEditor.getValue('transformAdvancedPivotEditor');
+      const wrapper = await testSubjects.find('transformAdvancedPivotEditor');
+      const editor = await wrapper.findByCssSelector('.monaco-editor .view-lines');
+      const advancedEditorString = await editor.getVisibleText();
       // Not all lines may be visible in the editor and thus aceEditor may not return all lines.
       // This means we might not get back valid JSON so we only test against the first few lines
       // and see if the string matches.