2 files changed, 11 insertions, 10 deletions

diff --git a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js
index 029ea31889..b1127386f7 100644
--- a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js
+++ b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js
@@ -40,7 +40,7 @@ describe('listEditor Module Tests', function () {
 			</ListEditorView>
 		);
 		expect(itemView).toBeTruthy();
-		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, 'sliders');
+		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, '__sliders');
 		TestUtils.Simulate.click(sliderIcon);
 	});
 
@@ -60,7 +60,7 @@ describe('listEditor Module Tests', function () {
 			</ListEditorItemView>
 		);
 		expect(itemView).toBeTruthy();
-		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, 'sliders');
+		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, '__sliders');
 		TestUtils.Simulate.click(sliderIcon);
 	});
 
@@ -71,7 +71,7 @@ describe('listEditor Module Tests', function () {
 			</ListEditorItemView>
 		);
 		expect(itemView).toBeTruthy();
-		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, 'trashO');
+		let sliderIcon = TestUtils.findRenderedDOMComponentWithClass(itemView, '__trashO');
 		TestUtils.Simulate.click(sliderIcon);
 	});
 
@@ -82,7 +82,8 @@ describe('listEditor Module Tests', function () {
 			</ListEditorItemView>
 		);
 		expect(itemView).toBeTruthy();
-		let trashIcon = TestUtils.scryRenderedDOMComponentsWithClass(itemView, 'fa-trash-o');
+		let trashIcon = TestUtils.scryRenderedDOMComponentsWithClass(itemView, '__trashOq');
 		expect(trashIcon).toEqual([]);
 	});
+
 });
diff --git a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js
index 7d4d57eb35..e14e9b76f5 100644
--- a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js
+++ b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js
@@ -16,7 +16,7 @@
 
 
 import React from 'react';
-
+import ReactDOMServer from 'react-dom/server';
 import TestUtils from 'react-addons-test-utils';
 import {mount} from 'enzyme';
 import VersionController from 'nfvo-components/panel/versionController/VersionController.jsx';
@@ -131,21 +131,21 @@ describe('versionController UI Component', () => {
 		let callVCActionProps = { ...props, version: '1.0', callVCAction: function(){} };
 		let versionController = mount(<VersionController isCheckedOut={true} status={statusEnum.CHECK_OUT_STATUS} {...callVCActionProps} />);
 		let elem = versionController.find('[data-test-id="vc-checkout-btn"]');
-		let svgIcon = versionController.find('.versionControllerLockClosed');
+
 		expect(elem).toBeTruthy();
 		expect(elem.length).toEqual(1);
-		expect(svgIcon.hasClass('disabled')).toBe(true);
+		expect(elem.find('.svg-icon').length).toEqual(1);
+		expect(elem.find('.svg-icon').hasClass('disabled')).toBe(true);
 	});
 
 	it('Doesn\'t show the checkout button', () => {
 		let callVCActionProps = { ...props, version: '1.0', callVCAction: function(){} };
 		let versionController = mount(<VersionController isCheckedOut={false} status={statusEnum.CHECK_IN_STATUS} {...callVCActionProps} />);
 		let elem = versionController.find('[data-test-id="vc-checkout-btn"]');
-		let svgIcon = versionController.find('.versionControllerLockClosed');
-
 		expect(elem).toBeTruthy();
 		expect(elem.length).toBe(1);
-		expect(svgIcon.hasClass('disabled')).toBe(true);
+		expect(elem.find('.svg-icon').length).toEqual(1);
+		expect(elem.find('.svg-icon').hasClass('disabled')).toBe(true);
 
 	});