1 files changed, 24 insertions, 26 deletions

diff --git a/openecomp-ui/test/flows/flowsEditorModal.test.js b/openecomp-ui/test/flows/flowsEditorModal.test.js
index d8da97af4e..8371432032 100644
--- a/openecomp-ui/test/flows/flowsEditorModal.test.js
+++ b/openecomp-ui/test/flows/flowsEditorModal.test.js
@@ -1,33 +1,30 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-import expect from 'expect';
 import React from 'react';
 import TestUtils from 'react-addons-test-utils';
 import {mapStateToProps} from 'sdc-app/flows/FlowsEditorModal.js';
 import FlowsEditorModalView from 'sdc-app/flows/FlowsEditorModalView.jsx';
 
+import {FlowBasicFactory} from 'test-utils/factories/flows/FlowsFactories.js';
+
 describe('Flows Editor Modal Mapper and View Classes: ', function () {
 
 	it('mapStateToProps mapper exists', () => {
-		expect(mapStateToProps).toExist();
+		expect(mapStateToProps).toBeTruthy();
 	});
 
 	it('mapStateToProps mapper - without currentFlow', () => {
@@ -36,22 +33,22 @@ describe('Flows Editor Modal Mapper and View Classes: ', function () {
 			diagramType: 'SOME_TYPE'
 		};
 		var results = mapStateToProps({flows});
-		expect(results.currentFlow).toExist();
+		expect(results.currentFlow).toBeTruthy();
 		expect(results.currentFlow.artifactName).toBe('');
 		expect(results.currentFlow.description).toBe('');
 	});
 
 	it('mapStateToProps mapper - populated currentFlow', () => {
-		let artifactName = 'test1', description = 'desc';
+		const currentFlow = FlowBasicFactory.build({artifactType: 'WORKFLOW'});
 		var flows = {
-			currentFlow: {artifactName, description},
+			data: currentFlow,
 			serviceID: '123',
-			diagramType: 'SOME_TYPE'
+			diagramType: 'WORKFLOW'
 		};
 		var results = mapStateToProps({flows});
-		expect(results.currentFlow).toExist();
-		expect(results.currentFlow.artifactName).toBe(artifactName);
-		expect(results.currentFlow.description).toBe(description);
+		expect(results.currentFlow).toBeTruthy();
+		expect(results.currentFlow.artifactName).toBe(currentFlow.artifactName);
+		expect(results.currentFlow.description).toBe(currentFlow.description);
 		expect(results.currentFlow.serviceID).toBe(flows.serviceID);
 		expect(results.currentFlow.artifactType).toBe(flows.diagramType);
 	});
@@ -62,9 +59,9 @@ describe('Flows Editor Modal Mapper and View Classes: ', function () {
 			<FlowsEditorModalView
 				onCancel={()=>{}}
 				onDataChanged={()=>{}}
-				currentFlow={{artifactName: '', description: ''}}/>);
+				currentFlow={FlowBasicFactory.build({artifactName: '', description: ''})}/>);
 		let renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 	});
 
 	it('modal view component run with data changed handler', done => {
@@ -73,10 +70,11 @@ describe('Flows Editor Modal Mapper and View Classes: ', function () {
 			<FlowsEditorModalView
 				onCancel={()=>{}}
 				onDataChanged={handler}
-				currentFlow={{artifactName: '', description: ''}}/>);
+				currentFlow={FlowBasicFactory.build({artifactName: '', description: ''})}
+				genericFieldInfo={{artifactName : {isValid: true, errorText: ''}, description: {isValid: true, errorText: ''}}} />);
 		let result = TestUtils.scryRenderedDOMComponentsWithTag(document, 'input');
-		expect(result).toExist();
-		expect(result.length).toExist();
+		expect(result).toBeTruthy();
+		expect(result.length).toBeTruthy();
 		TestUtils.Simulate.change(result[0]);
 	});