{
scope={scopeMock}
stageEditorParams={stageEditorParams}
/>);
- component.find('[data-test-subj="inputControlEditorAddBtn"]').simulate('click');
+ findTestSubject(component, 'inputControlEditorAddBtn', false).simulate('click');
// Use custom match function since control.id is dynamically generated and never the same.
sinon.assert.calledWith(stageEditorParams, sinon.match((newParams) => {
if (newParams.controls.length !== 3) {
@@ -99,7 +99,7 @@ test('remove control btn', () => {
scope={scopeMock}
stageEditorParams={stageEditorParams}
/>);
- component.find('[data-test-subj="inputControlEditorRemoveControl0"]').simulate('click');
+ findTestSubject(component, 'inputControlEditorRemoveControl0', false).simulate('click');
const expectedParams = {
'controls': [
{
@@ -123,7 +123,7 @@ test('move down control btn', () => {
scope={scopeMock}
stageEditorParams={stageEditorParams}
/>);
- component.find('[data-test-subj="inputControlEditorMoveDownControl0"]').simulate('click');
+ findTestSubject(component, 'inputControlEditorMoveDownControl0', false).simulate('click');
const expectedParams = {
'controls': [
{
@@ -159,7 +159,7 @@ test('move up control btn', () => {
scope={scopeMock}
stageEditorParams={stageEditorParams}
/>);
- component.find('[data-test-subj="inputControlEditorMoveUpControl1"]').simulate('click');
+ findTestSubject(component, 'inputControlEditorMoveUpControl1', false).simulate('click');
const expectedParams = {
'controls': [
{
diff --git a/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/vis.test.js.snap b/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
similarity index 98%
rename from src/core_plugins/input_control_vis/public/components/vis/__snapshots__/vis.test.js.snap
rename to src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
index 67734997dcdcb..d3f863b575c06 100644
--- a/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/vis.test.js.snap
+++ b/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
@@ -12,6 +12,7 @@ exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
>
{
hasChanges={() => { return true; }}
hasValues={() => { return true; }}
/>);
- component.find('[data-test-subj="inputControlClearBtn"]').simulate('click');
+ findTestSubject(component, 'inputControlClearBtn', false).simulate('click');
sinon.assert.calledOnce(clearControls);
sinon.assert.notCalled(submitFilters);
sinon.assert.notCalled(resetControls);
@@ -132,7 +133,7 @@ test('submitFilters', () => {
hasChanges={() => { return true; }}
hasValues={() => { return true; }}
/>);
- component.find('[data-test-subj="inputControlSubmitBtn"]').simulate('click');
+ findTestSubject(component, 'inputControlSubmitBtn', false).simulate('click');
sinon.assert.calledOnce(submitFilters);
sinon.assert.notCalled(clearControls);
sinon.assert.notCalled(resetControls);
@@ -150,7 +151,7 @@ test('resetControls', () => {
hasChanges={() => { return true; }}
hasValues={() => { return true; }}
/>);
- component.find('[data-test-subj="inputControlCancelBtn"]').simulate('click');
+ findTestSubject(component, 'inputControlCancelBtn', false).simulate('click');
sinon.assert.calledOnce(resetControls);
sinon.assert.notCalled(clearControls);
sinon.assert.notCalled(submitFilters);
@@ -168,7 +169,7 @@ test('stageFilter list control', () => {
hasChanges={() => { return true; }}
hasValues={() => { return true; }}
/>);
- const reactSelectInput = component.find(`#${mockListControl.id}`);
+ const reactSelectInput = component.find(`#${mockListControl.id}`).hostNodes();
reactSelectInput.simulate('change', { target: { value: 'choice1' } });
reactSelectInput.simulate('keyDown', { keyCode: 9, key: 'Tab' });
sinon.assert.notCalled(clearControls);
diff --git a/src/core_plugins/input_control_vis/public/vis_controller.js b/src/core_plugins/input_control_vis/public/vis_controller.js
index 32588b43dc73b..e6d5b8bb261e6 100644
--- a/src/core_plugins/input_control_vis/public/vis_controller.js
+++ b/src/core_plugins/input_control_vis/public/vis_controller.js
@@ -1,6 +1,6 @@
import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
-import { InputControlVis } from './components/vis/vis';
+import { InputControlVis } from './components/vis/input_control_vis';
import { controlFactory } from './control/control_factory';
class VisController {
diff --git a/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap b/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
index 766b9e8f2dfee..bca26ea0e8472 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
+++ b/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
@@ -26,6 +26,7 @@ exports[`renders DashboardGrid 1`] = `
>
});
};
const component = mount();
-
setTimeout(() => {
+ component.update();
const panelError = component.find(PanelError);
expect(panelError.length).toBe(1);
done();
diff --git a/ui_framework/src/components/color_picker/__snapshots__/color_picker.test.js.snap b/ui_framework/src/components/color_picker/__snapshots__/color_picker.test.js.snap
index 01fa997444f96..660f947c68c21 100644
--- a/ui_framework/src/components/color_picker/__snapshots__/color_picker.test.js.snap
+++ b/ui_framework/src/components/color_picker/__snapshots__/color_picker.test.js.snap
@@ -12,7 +12,7 @@ exports[`renders KuiColorPicker 1`] = `
aria-label="aria-label"
class="kuiColorPicker__swatch"
data-test-subj="colorSwatch"
- style="background:#ffeedd;"
+ style="background:#ffeedd"
/>
diff --git a/ui_framework/src/components/color_picker/color_picker.test.js b/ui_framework/src/components/color_picker/color_picker.test.js
index 8c848634e342b..ae560fce67f59 100644
--- a/ui_framework/src/components/color_picker/color_picker.test.js
+++ b/ui_framework/src/components/color_picker/color_picker.test.js
@@ -102,7 +102,6 @@ test('Setting a new color calls onChange', () => {
const event = { target: { value: '#000000' } };
const inputs = colorPicker.find('input');
expect(inputs.length).toBe(1);
- inputs.get(0).value = '';
inputs.simulate('change', event);
sinon.assert.calledOnce(onChange);
sinon.assert.calledWith(onChange, '#000000');
diff --git a/ui_framework/src/components/form/text_input/text_input.test.js b/ui_framework/src/components/form/text_input/text_input.test.js
index c08efebaaa236..bda83ebe71648 100644
--- a/ui_framework/src/components/form/text_input/text_input.test.js
+++ b/ui_framework/src/components/form/text_input/text_input.test.js
@@ -1,6 +1,6 @@
import React from 'react';
import { render, shallow, mount } from 'enzyme';
-import { requiredProps } from '../../../test/required_props';
+import { requiredProps, findTestSubject } from '../../../test';
import sinon from 'sinon';
import {
@@ -55,8 +55,8 @@ describe('KuiTextInput', () => {
);
expect(
- component.find('[data-test-subj="input"]').matchesElement(document.activeElement)
- ).toBe(true);
+ findTestSubject(component, 'input')
+ ).toBe(document.activeElement);
});
test('does not focus the element by default', () => {
@@ -68,8 +68,8 @@ describe('KuiTextInput', () => {
);
expect(
- component.find('[data-test-subj="input"]').matchesElement(document.activeElement)
- ).toBe(false);
+ findTestSubject(component, 'input')
+ ).not.toBe(document.activeElement);
});
});
diff --git a/ui_framework/src/components/table/listing_table/listing_table.test.js b/ui_framework/src/components/table/listing_table/listing_table.test.js
index 01b274dc36270..84a283527b911 100644
--- a/ui_framework/src/components/table/listing_table/listing_table.test.js
+++ b/ui_framework/src/components/table/listing_table/listing_table.test.js
@@ -1,9 +1,6 @@
import React from 'react';
import { mount, shallow } from 'enzyme';
-import { requiredProps } from '../../../test/required_props';
-import {
- takeMountedSnapshot,
-} from 'ui_framework/src/test';
+import { requiredProps, takeMountedSnapshot } from '../../../test';
import {
KuiListingTable,
} from './listing_table';