@onehat/ui 0.4.33 → 0.4.35

package/src/Functions/Cypress/form_functions.js

@@ -167,7 +167,7 @@ export function setTagValue(selectors, value) {
 				return;
 			}
 			cy.get(selector).eq(0)
-				.click()
+				.click({ force: true })
 				.then(() => {
 					clickButtonsWithRemove(selector); // Recursive call for the next element
 				});
@@ -274,100 +274,100 @@ export function setInputValue(selectors, value) {
 	setTextValue(selectors, value);
 }
 
+/**
+ * Given a form,
+ * return a url-encoded string representing all keys and values
+ *
+ * @param {jQuery} form
+ * @return {String}
+ * /
+export function formSerialize(form) {
+	'use strict';
+	var i, j, len, jLen, formElement, 
+		q = [],
+		theForm = form[0],
+		varCounters = {};
+
+	function addNameValue(name, value) { // create this function so I can use varCounters for 
+		var matches = name.match(/([\w\d]+)\[\]/i),
+			varName,
+			ix = 0;
+		if (matches && matches[1]) {
+			varName = matches[1];
+			if (typeof varCounters[varName] === 'undefined') {
+				varCounters[varName] = ix;
+			} else {
+				ix = ++varCounters[varName];
+			}
+			name = varName + '[' + ix + ']';
+		}
+		q.push(urlencode(name) + '=' + urlencode(value));
+	}
 
-// /**
-//  * Given a form,
-//  * return a url-encoded string representing all keys and values
-//  *
-//  * @param {jQuery} form
-//  * @return {String}
-//  */
-// export function formSerialize(form) {
-// 	'use strict';
-// 	var i, j, len, jLen, formElement, 
-// 		q = [],
-// 		theForm = form[0],
-// 		varCounters = {};
-
-// 	function addNameValue(name, value) { // create this function so I can use varCounters for 
-// 		var matches = name.match(/([\w\d]+)\[\]/i),
-// 			varName,
-// 			ix = 0;
-// 		if (matches && matches[1]) {
-// 			varName = matches[1];
-// 			if (typeof varCounters[varName] === 'undefined') {
-// 				varCounters[varName] = ix;
-// 			} else {
-// 				ix = ++varCounters[varName];
-// 			}
-// 			name = varName + '[' + ix + ']';
-// 		}
-// 		q.push(urlencode(name) + '=' + urlencode(value));
-// 	}
-
-// 	if (!theForm || !theForm.nodeName || theForm.nodeName.toLowerCase() !== 'form') {
-// 		throw 'You must supply a form element';
-// 	}
-// 	for (i = 0, len = theForm.elements.length; i < len; i++) {
-// 		formElement = theForm.elements[i];
-// 		if (formElement.name === '' || formElement.disabled) {
-// 			continue;
-// 		}
-// 		switch (formElement.nodeName.toLowerCase()) {
-// 			case 'input':
-// 				switch (formElement.type) {
-// 					case 'text':
-// 					case 'hidden':
-// 					case 'password':
-// 					case 'button': // Not submitted when submitting form manually, though jQuery does serialize this and it can be an HTML4 successful control
-// 					case 'submit':
-// 						addNameValue(formElement.name, formElement.value);
-// 						break;
-// 					case 'checkbox':
-// 					case 'radio':
-// 						if (formElement.checked) {
-// 							addNameValue(formElement.name, formElement.value);
-// 						} else if (formElement.value === '1') {
-// 							addNameValue(formElement.name, '0'); // Submit actual value of zero for booleans, instead of no value at all
-// 						}
-// 						break;
-// 					case 'file':
-// 						// addNameValue(formElement.name, formElement.value); // Will work and part of HTML4 "successful controls", but not used in jQuery
-// 						break;
-// 					case 'reset':
-// 						break;
-// 				}
-// 				break;
-// 			case 'textarea':
-// 				addNameValue(formElement.name, formElement.value);
-// 				break;
-// 			case 'select':
-// 				switch (formElement.type) {
-// 					case 'select-one':
-// 						addNameValue(formElement.name, formElement.value);
-// 						break;
-// 					case 'select-multiple':
-// 						for (j = 0, jLen = formElement.options.length; j < jLen; j++) {
-// 							if (formElement.options[j].selected) {
-// 								addNameValue(formElement.name, formElement.options[j].value);
-// 							}
-// 						}
-// 						break;
-// 				}
-// 				break;
-// 			case 'button': // jQuery does not submit these, though it is an HTML4 successful control
-// 				switch (formElement.type) {
-// 					case 'reset':
-// 					case 'submit':
-// 					case 'button':
-// 						addNameValue(formElement.name, formElement.value);
-// 						break;
-// 				}
-// 				break;
-// 		}
-// 	}
-// 	return q.join('&');
-// }
+	if (!theForm || !theForm.nodeName || theForm.nodeName.toLowerCase() !== 'form') {
+		throw 'You must supply a form element';
+	}
+	for (i = 0, len = theForm.elements.length; i < len; i++) {
+		formElement = theForm.elements[i];
+		if (formElement.name === '' || formElement.disabled) {
+			continue;
+		}
+		switch (formElement.nodeName.toLowerCase()) {
+			case 'input':
+				switch (formElement.type) {
+					case 'text':
+					case 'hidden':
+					case 'password':
+					case 'button': // Not submitted when submitting form manually, though jQuery does serialize this and it can be an HTML4 successful control
+					case 'submit':
+						addNameValue(formElement.name, formElement.value);
+						break;
+					case 'checkbox':
+					case 'radio':
+						if (formElement.checked) {
+							addNameValue(formElement.name, formElement.value);
+						} else if (formElement.value === '1') {
+							addNameValue(formElement.name, '0'); // Submit actual value of zero for booleans, instead of no value at all
+						}
+						break;
+					case 'file':
+						// addNameValue(formElement.name, formElement.value); // Will work and part of HTML4 "successful controls", but not used in jQuery
+						break;
+					case 'reset':
+						break;
+				}
+				break;
+			case 'textarea':
+				addNameValue(formElement.name, formElement.value);
+				break;
+			case 'select':
+				switch (formElement.type) {
+					case 'select-one':
+						addNameValue(formElement.name, formElement.value);
+						break;
+					case 'select-multiple':
+						for (j = 0, jLen = formElement.options.length; j < jLen; j++) {
+							if (formElement.options[j].selected) {
+								addNameValue(formElement.name, formElement.options[j].value);
+							}
+						}
+						break;
+				}
+				break;
+			case 'button': // jQuery does not submit these, though it is an HTML4 successful control
+				switch (formElement.type) {
+					case 'reset':
+					case 'submit':
+					case 'button':
+						addNameValue(formElement.name, formElement.value);
+						break;
+				}
+				break;
+		}
+	}
+	return q.join('&');
+}
+*/
 
 
 
@@ -377,94 +377,100 @@ export function setInputValue(selectors, value) {
 // / /_/ /  __/ /_/ /_/  __/ /  (__  )
 // \____/\___/\__/\__/\___/_/  /____/
 
-// /**
-//  * Get data from a form
-//  * @param {object} schema - fieldName/fieldType pairs
-//  * @returns {object} formValues - object of fieldName/value pairs
-//  */
-// export function getFormValues(editor, schema) {
-// 	const fields = editor.find('.x-form-field'),
-// 		formValues = {};
-
-// 	_.each(fields, (field) => {
-// 		const fieldType = schema[field.name];
-// 		switch(fieldType) {
-// 			case 'checkbox':
-// 				formValues[fieldName] = getCheckboxValue(fieldName);
-// 				break;
-// 			case 'combo':
-// 				formValues[fieldName] = getComboValue(fieldName);
-// 				break;
-// 			case 'date':
-// 				formValues[fieldName] = getDateValue(fieldName);
-// 				break;
-// 			case 'datetime':
-// 				formValues[fieldName] = getDatetimeValue(fieldName);
-// 				break;
-// 			case 'file':
-// 				formValues[fieldName] = getFileValue(fieldName);
-// 				break;
-// 			case 'number':
-// 				formValues[fieldName] = getNumberValue(fieldName);
-// 				break;
-// 			case 'radio':
-// 				formValues[fieldName] = getRadioValue(fieldName);
-// 				break;
-// 			case 'tag':
-// 				formValues[fieldName] = getTagValue(fieldName);
-// 				break;
-// 			case 'text':
-// 			case 'textarea':
-// 				formValues[fieldName] = getTextValue(fieldName);
-// 				break;
-// 			case 'time':
-// 				formValues[fieldName] = getTimeValue(fieldName);
-// 				break;
-// 		}
-// 	});
-// 	return formValues;
-// }
+/**
+ * Get data from a form
+ * @param {object} schema - fieldName/fieldType pairs
+ * @returns {object} formValues - object of fieldName/value pairs
+ * /
+export function getFormValues(editor, schema) {
+	const fields = editor.find('.x-form-field'),
+		formValues = {};
+
+	_.each(fields, (field) => {
+		const fieldType = schema[field.name];
+		switch(fieldType) {
+			case 'checkbox':
+				formValues[fieldName] = getCheckboxValue(fieldName);
+				break;
+			case 'combo':
+				formValues[fieldName] = getComboValue(fieldName);
+				break;
+			case 'date':
+				formValues[fieldName] = getDateValue(fieldName);
+				break;
+			case 'datetime':
+				formValues[fieldName] = getDatetimeValue(fieldName);
+				break;
+			case 'file':
+				formValues[fieldName] = getFileValue(fieldName);
+				break;
+			case 'number':
+				formValues[fieldName] = getNumberValue(fieldName);
+				break;
+			case 'radio':
+				formValues[fieldName] = getRadioValue(fieldName);
+				break;
+			case 'tag':
+				formValues[fieldName] = getTagValue(fieldName);
+				break;
+			case 'text':
+			case 'textarea':
+				formValues[fieldName] = getTextValue(fieldName);
+				break;
+			case 'time':
+				formValues[fieldName] = getTimeValue(fieldName);
+				break;
+		}
+	});
+	return formValues;
+}
+*/
 
 
-// /**
-//  * Validate that form values match what they're supposed to
-//  */
-// export function validateFormValues(data, schema) {
-// 	cy.wrap().then(() => { // Wrap this in a Cypress promise, so it executes in correct order, relative to other Cypress promises
-
-// 		const formValues = getFormValues(schema);
-// 		let diff = deepDiffObj(formValues, data);
-
-// 		// SPECIAL CASE: Omit password fields from diff
-// 		const omitFields = [];
-// 		_.each(diff, (value, key) => {
-// 			if (key.match(/^password/i)) {
-// 				omitFields.push(key);
-// 			}
-// 		});
-// 		if (omitFields.length) {
-// 			diff = _.omit(diff, omitFields);
-// 		}
+/**
+ * Validate that form values match what they're supposed to
+ * /
+export function validateFormValues(data, schema) {
+	cy.wrap().then(() => { // Wrap this in a Cypress promise, so it executes in correct order, relative to other Cypress promises
+
+		const formValues = getFormValues(schema);
+		let diff = deepDiffObj(formValues, data);
+
+		// SPECIAL CASE: Omit password fields from diff
+		const omitFields = [];
+		_.each(diff, (value, key) => {
+			if (key.match(/^password/i)) {
+				omitFields.push(key);
+			}
+		});
+		if (omitFields.length) {
+			diff = _.omit(diff, omitFields);
+		}
 		
-// 		// If there are still any differences, log them
-// 		if (_.keys(diff).length > 0) {
-// 			console.log('data', data);
-// 			console.log('formValues', formValues);
-// 			console.log('diff', diff);
-// 		}
-
-// 		expect(diff).to.deep.equal({});
-// 	});
-// }
+		// If there are still any differences, log them
+		if (_.keys(diff).length > 0) {
+			console.log('data', data);
+			console.log('formValues', formValues);
+			console.log('diff', diff);
+		}
+
+		expect(diff).to.deep.equal({});
+	});
+}
+*/
 
 
 
 // export function getCheckboxValue(fieldName) {
 
 // }
-// export function getComboValue(fieldName) {
-	
-// }
+export function getComboValue(selectors, fieldName) {
+	cy.log('getComboValue ' + fieldName);
+	return getDomNode([...selectors, 'field-' + fieldName, 'input']).then((field) => {
+		return cy.wrap(field)
+				.invoke('val');
+	});
+}
 // export function getDateValue(fieldName) {
 	
 // }

package/src/Functions/Cypress/grid_functions.js

@@ -11,6 +11,15 @@ import _ from 'lodash';
 const $ = Cypress.$;
 
 
+// Get cells
+export function getGridCellValue(gridSelector, rowId, field) {
+	cy.log('getGridCellValue ' + gridSelector + ' ' + rowId + ' ' + field);
+	const rowSelector = getGridRowSelectorById(gridSelector, rowId);
+	return getDomNode([gridSelector, rowSelector, 'cell-' + field])
+				.invoke('text');
+}
+
+
 
 // Get rows
 export function hasRowWithFieldValue(gridSelector, field, value) {
@@ -56,12 +65,16 @@ export function selectGridRowIfNotAlreadySelectedById(gridSelector, id) {
 		}
 	})
 }
+export function selectGridRowByIx(gridSelector, ix) {
+	cy.log('selectGridRowByIx ' + gridSelector + ' ' + ix);
+	
+	ix++; // compensate for header row
+	getDomNode([gridSelector, '[data-ix=' + ix + ']'])
+		.click();
+}
 // export function selectRowWithText(grid, text) {
 // 	getRowWithText(grid, text).click(5, 5);
 // }
-// export function selectRowWithIx(grid, ix) {
-// 	getRowWithIx(grid, ix).click(5, 5);
-// }
 // export function cmdClickRowWithId(grid, id) {
 // 	getRowWithId(grid, id).click('left', { metaKey: true });
 // }
@@ -234,12 +247,8 @@ export function getModelFromGridSelector(gridSelector) {
 }
 export function getGridRowSelectorById(gridSelector, id) {
 	const
-		model = getModelFromGridSelector(gridSelector);
-
-		if (!model) {
-			debugger;
-		}
-		const inflected = fixInflector(Inflector.camelize(Inflector.pluralize(model)));
+		model = getModelFromGridSelector(gridSelector),
+		inflected = fixInflector(Inflector.camelize(Inflector.pluralize(model)));
 	return inflected + '-' + id;
 }
 

package/src/Functions/Cypress/utilities.js

@@ -12,7 +12,14 @@ export function bootstrapRouteWaiters() {
 	cy.intercept('POST', '**/add**').as('addWaiter');
 	cy.intercept('POST', '**/edit**').as('editWaiter');
 	cy.intercept('POST', '**/delete**').as('deleteWaiter');
-	cy.intercept('POST', '**/getReport**').as('getReportWaiter');
+	cy.intercept('GET', '**/getReport**').as('getReportWaiter');
+	cy.intercept('POST', '**/getReport**').as('postReportWaiter');
+	cy.intercept('POST', '**/emailModelPdf**').as('emailModelPdf');
+}
+export function stubWindowOpen() { // This needs to be called after the page in question has loaded. See https://docs.cypress.io/api/commands/stub#Replace-built-in-window-methods-like-prompt
+	cy.window().then((win) => {
+		cy.stub(win, 'open').as('windowOpen');
+	});
 }
 export function fixInflector(str) {
 	// inflector-js doesn't handle pluralization of 'equipment' correctly