Completed unit tests

Author: Sam Menza

src/combobox/tests/unit/ComboBox.ts

@@ -28,24 +28,8 @@ import {
 
 const harness = createHarness([ compareId, compareWidgetId, compareAria, compareAriaControls ]);
 
-const _helperText = 'This input is valid';
-
-const _validity = { valid: false, message: 'This input is invalid' };
-
-function _getValid(valid: { valid?: boolean; message?: string; } | boolean | undefined): { valid: boolean | undefined; message: string | undefined } {
-	if (valid === undefined) {
-		return { valid: undefined, message: undefined };
-	}
-
-	if (typeof valid === 'boolean') {
-		return { valid, message: undefined };
-	}
-
-	return {
-		valid: valid.valid,
-		message: valid.message
-	};
-}
+const helperText = 'This is helpertext';
+const invalidMessage = 'This input is invalid';
 
 const testOptions: any[] = [
 	{
@@ -192,11 +176,11 @@ const getExpectedVdom = function(
 	label = false,
 	states: States = {},
 	focused = false,
-	validity?: { valid: boolean | undefined, message: string | undefined} | boolean | undefined
+	validity: { valid: boolean | undefined, message: string | undefined} = {valid: undefined, message: undefined},
+	helperText?: string
 ) {
-	const valid = _getValid(validity);
 	const menuVdom = getExpectedMenu(useTestProperties, open);
-	const controlsVdom = getExpectedControls(useTestProperties, label, states, valid);
+	const controlsVdom = getExpectedControls(useTestProperties, label, states, validity, helperText);
 	const { disabled, readOnly, required } = states;
 
 	return v('div', {
@@ -208,8 +192,8 @@ const getExpectedVdom = function(
 			open ? css.open : null,
 			useTestProperties ? css.clearable : null,
 			focused ? css.focused : null,
-			valid.valid === false ? css.invalid : null,
-			valid.valid === true ? css.valid : null
+			validity.valid === false ? css.invalid : null,
+			validity.valid === true ? css.valid : null
 		],
 		key: 'root',
 		role: 'combobox'
@@ -221,7 +205,7 @@ const getExpectedVdom = function(
 			disabled,
 			focused,
 			hidden: undefined,
-			invalid: !valid.valid,
+			invalid: !validity.valid,
 			readOnly,
 			required,
 			forId: useTestProperties ? 'foo' : ''
@@ -684,6 +668,52 @@ registerSuite('ComboBox', {
 			h.expectPartial('@dropdown', () => getExpectedMenu(true, true, { visualFocus: true }));
 			h.trigger('@dropdown', 'onmouseover', stubEvent);
 			h.expectPartial('@dropdown', () => getExpectedMenu(true, true));
+		},
+
+		'renders helpertext'() {
+			const h = harness(() => w(ComboBox, {
+				...testProperties,
+				helperText: helperText
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: undefined, message: undefined}, helperText));
+		},
+
+		'renders validity correctly'() {
+			let h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: undefined
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: undefined, message: undefined}));
+
+			h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: true
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: true, message: undefined}));
+
+			h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: false
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: false, message: undefined}));
+
+			h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: {valid: true, message: invalidMessage}
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: true, message: invalidMessage}));
+
+			h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: {valid: false, message: invalidMessage}
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: false, message: invalidMessage}));
+
+			h = harness(() => w(ComboBox, {
+				...testProperties,
+				valid: {valid: false, message: undefined}
+			}));
+			h.expect(() =>  getExpectedVdom(true, false, true, {}, false, {valid: false, message: undefined}));
 		}
 	}
 });