fix CITs after master merge

elastic · Jun 22, 2020 · fe68f96 · fe68f96
1 parent 1c4e4f2
commit fe68f96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/...ion/components/pipeline_processors_editor/__jest__/pipeline_processors_editor.helpers.tsx b/...ion/components/pipeline_processors_editor/__jest__/pipeline_processors_editor.helpers.tsx
@@ -24,8 +24,15 @@ jest.mock('@elastic/eui', () => {
         }}
       />
     ),
-    // Mocking EuiCodeEditor, which uses React Ace under the hood
-    EuiCodeEditor: (props: any) => (
+  };
+});
+
+jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
       <input
         data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
         data-currentvalue={props.value}
@@ -95,8 +102,9 @@ const createActions = (testBed: TestBed<TestSubject>) => {
       act(() => {
         find(`${processorSelector}.moveItemButton`).simulate('click');
       });
+      component.update();
       act(() => {
-        find(dropZoneSelector).last().simulate('click');
+        find(dropZoneSelector).simulate('click');
       });
       component.update();
     },

diff --git a/...ors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx b/...ors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
@@ -105,7 +105,6 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
                       size="s"
                       disabled={disabled}
                       aria-label={editorItemMessages.moveButtonLabel}
-                      size="s"
                       onClick={onMove}
                       iconType="sortable"
                     />
@@ -146,6 +145,7 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <ContextMenu
+              data-test-subj="moreMenu"
               disabled={disabled}
               showAddOnFailure={!processor.onFailure?.length}
               onAddOnFailure={() => {

diff --git a/...ponents/pipeline_processors_editor/components/processors_tree/components/private_tree.tsx b/...ponents/pipeline_processors_editor/components/processors_tree/components/private_tree.tsx
@@ -92,9 +92,7 @@ export const PrivateTree: FunctionComponent<PrivateProps> = ({
                 });
               }}
               isVisible={Boolean(movingProcessor)}
-              isDisabled={Boolean(
-                !movingProcessor || isDropZoneAboveDisabled(info, movingProcessor!)
-              )}
+              isDisabled={!movingProcessor || isDropZoneAboveDisabled(info, movingProcessor)}
             />
           </EuiFlexItem>
         ) : undefined}
@@ -111,9 +109,7 @@ export const PrivateTree: FunctionComponent<PrivateProps> = ({
           <DropZoneButton
             data-test-subj={`dropButtonBelow-${stringifiedSelector}`}
             isVisible={Boolean(movingProcessor)}
-            isDisabled={Boolean(
-              !movingProcessor || isDropZoneBelowDisabled(info, movingProcessor!)
-            )}
+            isDisabled={!movingProcessor || isDropZoneBelowDisabled(info, movingProcessor)}
             onClick={(event) => {
               event.preventDefault();
               onAction({