Merge "[SDC] OnBoard with enabled tests and features"

2 files changed, 22 insertions, 5 deletions

diff --git a/openecomp-ui/test-utils/MockSVGIcon.js b/openecomp-ui/test-utils/MockSVGIcon.js
new file mode 100644
index 0000000000..6ce76cf91a
--- /dev/null
+++ b/openecomp-ui/test-utils/MockSVGIcon.js
@@ -0,0 +1,17 @@
+import React from 'react';
+//import ReactDOMServer from 'react-dom/server';
+
+const SVGIcon = ({name, onClick, label, className, iconClassName, labelClassName, labelPosition, color, disabled, ...other}) => {
+	let colorClass = (color !== '') ? '__' + color : '';
+	let classes = `svg-icon-wrapper ${iconClassName} ${className} ${colorClass} ${onClick ? 'clickable' : ''} ${disabled ? 'disabled' : ''} ${labelPosition}`;
+
+	let iconMock = (
+		<div {...other} onClick={onClick} className={classes}>
+			<span className={`svg-icon __${name} ${disabled ? 'disabled' : ''}`} />
+			{label && <span className={`svg-icon-label ${labelClassName}`}>{label}</span>}
+		</div>
+	);
+//	console.log(ReactDOMServer.renderToStaticMarkup(iconMock));
+	return iconMock;
+};
+export default SVGIcon;
diff --git a/openecomp-ui/test-utils/factories/licenseModel/LimitFactories.js b/openecomp-ui/test-utils/factories/licenseModel/LimitFactories.js
index a08e7e6355..5ad8b12228 100644
--- a/openecomp-ui/test-utils/factories/licenseModel/LimitFactories.js
+++ b/openecomp-ui/test-utils/factories/licenseModel/LimitFactories.js
@@ -19,20 +19,20 @@ import {limitType} from 'sdc-app/onboarding/licenseModel/limits/LimitEditorConst
 import IdMixin from 'test-utils/factories/mixins/IdMixin.js';
 
 Factory.define('LimitBaseFactory')
-	.attrs({		
+	.attrs({
 		name: 'SpLimit1',
 		type: limitType.SERVICE_PROVIDER,
 		description: 'fgfg',
-		metric: 'CPU',
 		value: 45,
-		unit: 55,
 		aggregationFunction: 'Peak',
-		time: 'Day'		
+		time: 'Day'
 	});
 
 export const LimitPostFactory = new Factory()
+	.attrs({metric: {choice: 'BWDT', other: ''}, unit: {choice: 'GB', other: ''}})
 	.extend('LimitBaseFactory');
 
 export const LimitItemFactory = new Factory()
+	.attrs({metric: 'BWDT', unit:  'GB'})
 	.extend('LimitBaseFactory')
-	.extend(IdMixin);	
+	.extend(IdMixin);