Added a simple UI cypress test, improvements to ui menu

test/cypress/support/commands.js

@@ -28,7 +28,18 @@ Cypress.Commands.add('validateSwaggerSchema', (method, code, path, data) => {
 	}).should('equal', null);
 });
 
-Cypress.Commands.add('getToken', () => {
+/**
+ * @param {object} defaultUser
+ * @param {object} defaultAuth
+*/
+Cypress.Commands.add('getToken', (defaultUser, defaultAuth) => {
+	if (typeof defaultAuth === 'object' && defaultAuth) {
+		if (!defaultUser) {
+			defaultUser = {};
+		}
+		defaultUser.auth = defaultAuth;
+	}
+
 	cy.task('backendApiGet', {
 		path: '/api/',
 	}).then((data) => {
@@ -38,40 +49,52 @@ Cypress.Commands.add('getToken', () => {
 		if (!data.result.setup) {
 			cy.log('Setup = false');
 			// create a new user
-			cy.createInitialUser().then(() => {
-				return cy.getToken();
+			cy.createInitialUser(defaultUser).then(() => {
+				return cy.getToken(defaultUser);
 			});
 		} else {
+			let auth = {
+				type:     'password',
+				identity: 'cypress@example.com',
+				secret:   'changeme',
+			};
+
+			if (typeof defaultUser === 'object' && defaultUser && typeof defaultUser.auth === 'object' && defaultUser.auth) {
+				auth = Object.assign({}, auth, defaultUser.auth);
+			}
+
 			cy.log('Setup = true');
 			// login with existing user
 			cy.task('backendApiPost', {
 				path: '/api/tokens',
-				data: {
-					type:     'password',
-					identity: 'jc@jc21.com',
-					secret:   'changeme'
-				}
-			}).then(res => {
+				data: auth,
+			}).then((res) => {
 				cy.wrap(res.result.token);
 			});
 		}
 	});
 });
 
-Cypress.Commands.add('createInitialUser', () => {
+Cypress.Commands.add('createInitialUser', (defaultUser) => {
+	let user = {
+		name:        'Cypress McGee',
+		nickname:    'Cypress',
+		email:       'cypress@example.com',
+		roles:       [],
+		is_disabled: false,
+		auth:        {
+			type:   'password',
+			secret: 'changeme'
+		}
+	};
+
+	if (typeof defaultUser === 'object' && defaultUser) {
+		user = Object.assign({}, user, defaultUser);
+	}
+
 	return cy.task('backendApiPost', {
 		path: '/api/users',
-		data: {
-			name:        'Jamie Curnow',
-			nickname:    'James',
-			email:       'jc@jc21.com',
-			roles:       [],
-			is_disabled: false,
-			auth:        {
-				type:   'password',
-				secret: 'changeme'
-			}
-		}
+		data: user,
 	}).then((data) => {
 		// Check the swagger schema:
 		cy.validateSwaggerSchema('post', 201, '/users', data);
@@ -80,3 +103,12 @@ Cypress.Commands.add('createInitialUser', () => {
 		cy.wrap(data.result);
 	});
 });
+
+Cypress.Commands.add('resetUsers', () => {
+	cy.task('backendApiDelete', {
+		path: '/api/users'
+	}).then((data) => {
+		expect(data).to.have.property('result', true);
+		cy.wrap(data.result);
+	});
+});