ESLint: cleanup await expect from protractor tests (#9630)

This commit is contained in:
Denys Vuika
2024-04-30 08:07:10 -04:00
committed by GitHub
parent 4109f272ea
commit f401b8c13e
114 changed files with 2096 additions and 1908 deletions

View File

@@ -22,8 +22,16 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../../util/constants');
import { AdminGroupsApi } from '@alfresco/js-api';
describe('People and Group widget', () => {
interface AppGroupUser {
firstName: string;
lastName: string;
}
interface AppSubGroup {
name: string;
}
describe('People and Group widget', () => {
const app = browser.params.resources.Files.MORE_WIDGETS;
const loginPage = new LoginPage();
@@ -59,7 +67,7 @@ describe('People and Group widget', () => {
const name = 'group visibility task';
const groupVisibilityForm = app.ADD_GROUP_VISIBILITY;
await taskPage.createTask({ name, formName: groupVisibilityForm.formName });
await expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
await taskPage.formFields().checkWidgetIsHidden(groupVisibilityForm.FIELD.widget_id);
await widget.checkboxWidget().clickCheckboxInput(groupVisibilityForm.FIELD.checkbox_id);
@@ -67,8 +75,8 @@ describe('People and Group widget', () => {
await widget.groupWidget().insertGroup(groupVisibilityForm.FIELD.widget_id, groupVisibilityForm.searchTerm);
await widget.groupWidget().checkDropDownListIsDisplayed();
const suggestions = await widget.groupWidget().getDropDownList();
await expect(suggestions.sort()).toEqual(['Heros', 'Users']);
const suggestions = (await widget.groupWidget().getDropDownList()).sort((a, b) => a.localeCompare(b));
expect(suggestions).toEqual(['Heros', 'Users']);
await widget.groupWidget().selectGroupFromDropDown('Users');
await taskPage.taskDetails().clickCompleteFormTask();
});
@@ -77,7 +85,7 @@ describe('People and Group widget', () => {
const name = 'group widget - subgroup restriction';
const subgroupFrom = app.ADD_GROUP_AND_SUBGROUP_RESTRICTION;
await taskPage.createTask({ name, formName: subgroupFrom.formName });
await expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
await taskPage.formFields().checkWidgetIsHidden(subgroupFrom.FIELD.widget_id);
await widget.checkboxWidget().clickCheckboxInput(subgroupFrom.FIELD.checkbox_id);
@@ -85,8 +93,8 @@ describe('People and Group widget', () => {
await widget.groupWidget().insertGroup(subgroupFrom.FIELD.widget_id, subgroupFrom.searchTerm);
await widget.groupWidget().checkDropDownListIsDisplayed();
const suggestions = await widget.groupWidget().getDropDownList();
await expect(suggestions.sort()).toEqual(getSubGroupsName().sort());
const suggestions = (await widget.groupWidget().getDropDownList()).sort((a, b) => a.localeCompare(b));
expect(suggestions).toEqual(getSubGroupsName());
await widget.groupWidget().selectGroupFromDropDown(getSubGroupsName()[0]);
await taskPage.taskDetails().clickCompleteFormTask();
@@ -95,14 +103,14 @@ describe('People and Group widget', () => {
await taskPage.tasksListPage().selectRow(name);
await widget.groupWidget().checkGroupFieldIsDisplayed();
await expect(await widget.groupWidget().getFieldValue(subgroupFrom.FIELD.widget_id)).toBe('Heros');
expect(await widget.groupWidget().getFieldValue(subgroupFrom.FIELD.widget_id)).toBe('Heros');
});
it('[C275714] Add people widget - group restrictions', async () => {
const name = 'people widget - group restrictions';
const peopleWidget = app.ADD_PEOPLE_AND_GROUP_RESTRICTION;
await taskPage.createTask({ name, formName: peopleWidget.formName });
await expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
expect(await taskPage.taskDetails().getTitle()).toEqual('Activities');
await taskPage.formFields().checkWidgetIsHidden(peopleWidget.FIELD.widget_id);
await widget.checkboxWidget().clickCheckboxInput(peopleWidget.FIELD.checkbox_id);
@@ -110,26 +118,39 @@ describe('People and Group widget', () => {
await widget.peopleWidget().insertUser(peopleWidget.FIELD.widget_id, peopleWidget.searchTerm);
await widget.peopleWidget().checkDropDownListIsDisplayed();
const suggestions = await widget.peopleWidget().getDropDownList();
await expect(suggestions.sort()).toEqual(getGroupMembers().sort());
const suggestions = (await widget.peopleWidget().getDropDownList()).sort((a, b) => a.localeCompare(b));
expect(suggestions).toEqual(getGroupMembers());
await widget.peopleWidget().selectUserFromDropDown(getGroupMembers()[0]);
await taskPage.taskDetails().clickCompleteFormTask();
});
/**
* Create group and users
*
* @param tenantId tenant id
*/
async function createGroupAndUsers(tenantId: number) {
await apiService.loginWithProfile('admin');
const userCreated = await Promise.all(app.groupUser.map(usersToCreate =>
usersActions.createUser(new UserModel({
tenantId,
firstName: usersToCreate.firstName,
lastName: usersToCreate.lastName
}))
));
const userCreated = await Promise.all(
app.groupUser.map((usersToCreate: AppGroupUser) =>
usersActions.createUser(
new UserModel({
tenantId,
firstName: usersToCreate.firstName,
lastName: usersToCreate.lastName
})
)
)
);
const subgroupUser = await usersActions.createUser(new UserModel({
tenantId, firstName: app.subGroupUser.firstName, lastName: app.subGroupUser.lastName
}));
const subgroupUser = await usersActions.createUser(
new UserModel({
tenantId,
firstName: app.subGroupUser.firstName,
lastName: app.subGroupUser.lastName
})
);
const group = await adminGroupsApi.createNewGroup({
name: app.group.name,
@@ -139,24 +160,37 @@ describe('People and Group widget', () => {
await Promise.all(userCreated.map((userToAddGroup: UserModel) => adminGroupsApi.addGroupMember(group.id, userToAddGroup.id)));
const subgroups: any[] = await Promise.all(getSubGroupsName().map((name) =>
adminGroupsApi.createNewGroup({
name,
tenantId,
type: 1,
parentGroupId: group.id
})
));
const subgroups = await Promise.all(
getSubGroupsName().map((name) =>
adminGroupsApi.createNewGroup({
name,
tenantId,
type: 1,
parentGroupId: group.id
})
)
);
await Promise.all(subgroups.map((subgroup) => adminGroupsApi.addGroupMember(subgroup.id, subgroupUser.id)));
}
function getSubGroupsName() {
return app.group.subgroup.map(subgroup => subgroup.name);
/**
* Get subgroups name
*
* @returns list of subgroup names
*/
function getSubGroupsName(): string[] {
return app.group.subgroup.map((subgroup: AppSubGroup) => subgroup.name).sort((a: string, b: string) => a.localeCompare(b));
}
function getGroupMembers() {
return app.groupUser.map(groupUser => `${groupUser.firstName} ${groupUser.lastName}`);
/**
* Get group members
*
* @returns list of group member full names
*/
function getGroupMembers(): string[] {
return app.groupUser
.map((groupUser: AppGroupUser) => `${groupUser.firstName} ${groupUser.lastName}`)
.sort((a: string, b: string) => a.localeCompare(b));
}
});