inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved e2e login api (#6248)

Browse Source 
* improved e2e login api

* throw error on missing profile
This commit is contained in:
Denys Vuika
2020-10-16 07:30:43 +01:00
committed by GitHub
parent 9d22f5505f
commit 217ae445c6
136 changed files with 409 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/process-services/about-process-services.e2e.ts
+3 -4
View File
@@ -15,7 +15,6 @@
* limitations under the License.
*/
import { AboutPage, ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
describe('About Process Services', () => {
@@ -30,16 +29,16 @@ describe('About Process Services', () => {
const usersActions = new UsersActions(apiService);
beforeAll(async() => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await loginPage.login(user.email, user.password);
await navigationBarPage.clickAboutButton();
});
afterAll(async() => {
await navigationBarPage.clickLogoutButton();
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/apps-section.e2e.ts
+2 -2
View File
@@ -41,11 +41,11 @@ describe('Modify applications', () => {
let firstApp, appVersionToBeDeleted;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
firstApp = await applicationService.importPublishDeployApp(app.file_path);
appVersionToBeDeleted = await applicationService.importPublishDeployApp(appToBeDeleted.file_path);
e2e/process-services/attach-file-content-service.e2e.ts
+3 -3
View File
@@ -78,7 +78,7 @@ describe('Attach File - Content service', () => {
beforeAll(async () => {
await LocalStorageUtil.setStorageItem('providers', 'ALL');
await apiService.getInstance().login(email, password);
await apiService.login(email, password);
user = await usersActions.createUser();
await apiServiceExternal.login(email, password);
@@ -95,7 +95,7 @@ describe('Attach File - Content service', () => {
host: browser.params.testConfig.adf_external_acs.host
});
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await uploadActions.uploadFile(pdfFileTwo.location, pdfFileTwo.name, '-my-');
await applicationService.importPublishDeployApp(app.file_path);
@@ -104,7 +104,7 @@ describe('Attach File - Content service', () => {
});
afterAll(async () => {
await apiService.getInstance().login(email, password);
await apiService.login(email, password);
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/attach-file-widget-start-task-app.e2e.ts
+3 -3
View File
@@ -52,15 +52,15 @@ describe('Start Task - Task App', () => {
const appFields = app.form_fields;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationService.importPublishDeployApp(app.file_path);
await loginPage.login(user.email, user.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/attach-folder.e2e.ts
+3 -3
View File
@@ -55,7 +55,7 @@ describe('Attach Folder', () => {
beforeAll(async () => {
await LocalStorageUtil.setStorageItem('providers', 'ALL');
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await integrationService.addCSIntegration({
@@ -63,7 +63,7 @@ describe('Attach Folder', () => {
name: 'adf dev',
host: browser.params.testConfig.appConfig.ecmHost
});
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationService.importPublishDeployApp(app.file_path);
await new UploadActions(apiService).createFolder(folderName, '-my-');
await searchService.isSearchable(folderName);
@@ -71,7 +71,7 @@ describe('Attach Folder', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/attach-form-component.e2e.ts
+3 -3
View File
@@ -50,13 +50,13 @@ describe('Attach Form Component', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
appModel = await applicationService.importPublishDeployApp(app.file_path);
@@ -67,7 +67,7 @@ describe('Attach Form Component', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appModel.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
e2e/process-services/checklist-component.e2e.ts
+2 -2
View File
@@ -47,14 +47,14 @@ describe('Checklist component', () => {
const hierarchyChecklist = ['checklistOne', 'checklistTwo', 'checklistOneChild', 'checklistTwoChild'];
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
e2e/process-services/comment-component-processes.e2e.ts
+3 -3
View File
@@ -38,11 +38,11 @@ describe('Comment component for Processes', () => {
const processName = 'Comment APS';
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
appId = importedApp.id;
@@ -55,7 +55,7 @@ describe('Comment component for Processes', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/comment-component-tasks.e2e.ts
+3 -3
View File
@@ -45,12 +45,12 @@ describe('Comment component for Processes', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
secondUser = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const importedApp = await new ApplicationsUtil(apiService).importPublishDeployApp(app.file_path);
appId = importedApp.id;
@@ -60,7 +60,7 @@ describe('Comment component for Processes', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/custom-process-filters-sorting.e2e.ts
+3 -3
View File
@@ -49,14 +49,14 @@ describe('Sorting for process filters', () => {
};
beforeEach(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const applicationsService = new ApplicationsUtil(apiService);
user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
importedApp = await applicationsService.importPublishDeployApp(app.file_path);
appId = importedApp.id;
@@ -67,7 +67,7 @@ describe('Sorting for process filters', () => {
afterEach(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
e2e/process-services/custom-process-filters.e2e.ts
+3 -5
View File
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import { browser } from 'protractor';
import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page';
@@ -48,19 +46,19 @@ describe('New Process Filters', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await loginPage.login(user.email, user.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
e2e/process-services/custom-tasks-filters.e2e.ts
+2 -2
View File
@@ -81,11 +81,11 @@ describe('Start Task - Custom App', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/dynamic-table-date-picker.e2e.ts
+6 -6
View File
@@ -43,13 +43,13 @@ describe('Dynamic Table', () => {
let user, tenantId, appId;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
tenantId = user.tenantId;
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
@@ -68,7 +68,7 @@ describe('Dynamic Table', () => {
const rowPosition = 0;
beforeAll(async () => {
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
appId = importedApp.id;
@@ -76,7 +76,7 @@ describe('Dynamic Table', () => {
});
afterAll(async () => {
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await navigationBarPage.clickLogoutButton();
});
@@ -130,7 +130,7 @@ describe('Dynamic Table', () => {
const dropdown = widget.dropdown();
beforeAll(async () => {
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
@@ -139,7 +139,7 @@ describe('Dynamic Table', () => {
});
afterAll(async () => {
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
});
e2e/process-services/empty-process-list-component.e2e.ts
+2 -2
View File
@@ -42,13 +42,13 @@ describe('Empty Process List Test', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const applicationsService = new ApplicationsUtil(apiService);
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationsService.importPublishDeployApp(appWithProcess.file_path);
await applicationsService.importPublishDeployApp(simpleAppWithUserForm.file_path);
e2e/process-services/form-component.e2e.ts
+3 -4
View File
@@ -17,7 +17,6 @@
import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { browser } from 'protractor';
describe('Form Component', () => {
@@ -48,13 +47,13 @@ describe('Form Component', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await loginPage.login(user.email, user.password);
@@ -62,7 +61,7 @@ describe('Form Component', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
e2e/process-services/form-people-widget.e2e.ts
+3 -3
View File
@@ -49,11 +49,11 @@ describe('Form widgets - People ', () => {
let appModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
const applicationsService = new ApplicationsUtil(apiService);
@@ -63,7 +63,7 @@ describe('Form widgets - People ', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/form-widgets-component.e2e.ts
+6 -6
View File
@@ -51,11 +51,11 @@ describe('Form widgets', () => {
const appFields = appWidget.form_fields;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModelWidget = await applicationsService.importPublishDeployApp(appWidget.file_path);
@@ -83,7 +83,7 @@ describe('Form widgets', () => {
afterAll(async () => {
await new NavigationBarPage().clickLogoutButton();
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
await apiService.getInstance().logout();
@@ -199,11 +199,11 @@ describe('Form widgets', () => {
let appModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
const processUtil = new ProcessUtil(apiService);
@@ -220,7 +220,7 @@ describe('Form widgets', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/info-drawer.e2e.ts
+3 -3
View File
@@ -74,7 +74,7 @@ describe('Info Drawer', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const assigneeUserModel = await usersActions.createUser();
assigneeUserModelFullName = assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName;
@@ -82,7 +82,7 @@ describe('Info Drawer', () => {
processUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
processUserModelFullName = processUserModel.firstName + ' ' + processUserModel.lastName;
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appCreated = await applicationsService.importPublishDeployApp(app.file_path);
await loginPage.login(processUserModel.email, processUserModel.password);
@@ -90,7 +90,7 @@ describe('Info Drawer', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appCreated.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/pagination-processlist-adding-processes.e2e.ts
+2 -2
View File
@@ -51,11 +51,11 @@ describe('Process List - Pagination when adding processes', () => {
let resultApp;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
resultApp = await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts
+2 -2
View File
@@ -53,11 +53,11 @@ describe('Items per page set to 15 and adding of tasks', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
resultApp = await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/people-component.e2e.ts
+2 -2
View File
@@ -43,7 +43,7 @@ describe('People component', () => {
const tasks = ['no people involved task', 'remove people task', 'can not complete task', 'multiple users', 'completed filter'];
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
assigneeUserModel = await usersActions.createUser();
secondAssigneeUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
@@ -52,7 +52,7 @@ describe('People component', () => {
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
e2e/process-services/process-attachment-list-action-menu.e2e.ts
+3 -3
View File
@@ -63,13 +63,13 @@ describe('Attachment list action menu for processes', () => {
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
appId = importedApp.id;
@@ -86,7 +86,7 @@ describe('Attachment list action menu for processes', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
e2e/process-services/process-filters-component.e2e.ts
+2 -2
View File
@@ -69,9 +69,9 @@ describe('Process Filters Test', () => {
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
await loginPage.login(user.email, user.password);
});
e2e/process-services/process-instance-details.e2e.ts
+3 -3
View File
@@ -43,11 +43,11 @@ describe('Process Instance Details', () => {
const PROCESS_DATE_FORMAT = 'll';
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
const processModel = await new ProcessUtil(apiService).startProcessOfApp(appModel.name);
@@ -65,7 +65,7 @@ describe('Process Instance Details', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appModel.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/process-list-component.e2e.ts
+3 -3
View File
@@ -58,11 +58,11 @@ describe('Process List Test', () => {
let procWithDate, completedProcWithDate, completedProcWithUserWidget;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
appDateModel = await applicationsUtil.importPublishDeployApp(appWithDateField.file_path);
@@ -91,7 +91,7 @@ describe('Process List Test', () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appDateModel.id);
await apiService.getInstance().activiti.modelsApi.deleteModel(appUserWidgetModel.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/processlist-pagination.e2e.ts
+3 -3
View File
@@ -63,11 +63,11 @@ describe('Process List - Pagination', () => {
let totalPages;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
deployedTestApp = await applicationsService.importPublishDeployApp(app.file_path);
@@ -76,7 +76,7 @@ describe('Process List - Pagination', () => {
describe('With processes Pagination', () => {
beforeAll(async () => {
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
for (let i = 0; i < nrOfProcesses; i++) {
await new ProcessUtil(apiService).startProcessOfApp(deployedTestApp.name);
e2e/process-services/sort-tasklist-pagination.e2e.ts
+2 -2
View File
@@ -56,11 +56,11 @@ describe('Task List Pagination - Sorting', () => {
};
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/standalone-task.e2e.ts
+2 -2
View File
@@ -42,14 +42,14 @@ describe('Start Task - Task App', () => {
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
e2e/process-services/start-process-component.e2e.ts
+2 -2
View File
@@ -83,13 +83,13 @@ describe('Start Process Component', () => {
describe('Provider: BPM', () => {
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const usersActions = new UsersActions(apiService);
procUserModel = await usersActions.createUser();
secondProcUserModel = await usersActions.createUser(new UserModel({ tenantId: procUserModel.tenantId }));
await apiServiceUserTwo.getInstance().login(secondProcUserModel.email, secondProcUserModel.password);
await apiServiceUserTwo.login(secondProcUserModel.email, secondProcUserModel.password);
const applicationsService = new ApplicationsUtil(apiServiceUserTwo);
appCreated = await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/start-task-custom-app.e2e.ts
+2 -2
View File
@@ -52,12 +52,12 @@ describe('Start Task - Custom App', () => {
});
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
assigneeUserModel = await usersActions.createUser();
processUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
e2e/process-services/start-task-task-app.e2e.ts
+2 -2
View File
@@ -56,7 +56,7 @@ describe('Start Task - Task App', () => {
});
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
assigneeUserModel = await usersActions.createUser();
@@ -65,7 +65,7 @@ describe('Start Task - Task App', () => {
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
e2e/process-services/stencil.e2e.ts
+3 -3
View File
@@ -53,17 +53,17 @@ describe('Stencil', () => {
let user: UserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
await applicationsService.importPublishDeployApp(app.file_path);
await loginPage.login(user.email, user.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/task-assignee.e2e.ts
+6 -6
View File
@@ -57,7 +57,7 @@ describe('Task Assignee', () => {
let user: UserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser(new UserModel({
firstName: app.candidate.firstName,
@@ -73,14 +73,14 @@ describe('Task Assignee', () => {
} catch (e) {
}
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
await loginPage.login(user.email, user.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
await navigationBarPage.clickLogoutButton();
});
@@ -127,7 +127,7 @@ describe('Task Assignee', () => {
let candidate2: UserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
candidate1 = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
candidate2 = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
@@ -157,14 +157,14 @@ describe('Task Assignee', () => {
} catch (e) {
}
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const appModel = await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
await new ProcessUtil(apiService).startProcessByDefinitionName(appModel.name, app.processNames[1]);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/task-attachment-list-action-menu.e2e.ts
+3 -3
View File
@@ -61,11 +61,11 @@ describe('Attachment list action menu for tasks', () => {
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const user = await usersActions.createUser();
tenantId = user.tenantId;
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const { id } = await applicationsService.importPublishDeployApp(app.file_path);
appId = id;
@@ -75,7 +75,7 @@ describe('Attachment list action menu for tasks', () => {
afterAll(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
});
e2e/process-services/task-audit.e2e.ts
+3 -3
View File
@@ -41,10 +41,10 @@ describe('Task Audit', () => {
const auditLogFile = 'Audit.pdf';
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await apiService.getInstance().activiti.taskApi.createNewTask(new TaskRepresentation({ name: taskTaskApp }));
const applicationsService = new ApplicationsUtil(apiService);
await applicationsService.importPublishDeployApp(app.file_path);
@@ -53,7 +53,7 @@ describe('Task Audit', () => {
});
afterAll( async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/task-details-form.e2e.ts
+3 -3
View File
@@ -71,9 +71,9 @@ describe('Task Details - Form', () => {
'stencilSet': 0
};
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
attachedForm = await apiService.getInstance().activiti.modelsApi.createModel(attachedFormModel);
newForm = await apiService.getInstance().activiti.modelsApi.createModel(newFormModel);
@@ -88,7 +88,7 @@ describe('Task Details - Form', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/task-details-no-form.e2e.ts
+3 -3
View File
@@ -37,10 +37,10 @@ describe('Task Details - No form', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
const applicationsService = new ApplicationsUtil(apiService);
importedApp = await applicationsService.importPublishDeployApp(app.file_path);
await new ProcessUtil(apiService).startProcessOfApp(importedApp.name);
@@ -48,7 +48,7 @@ describe('Task Details - No form', () => {
});
afterAll( async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/task-details.e2e.ts
+3 -3
View File
@@ -59,17 +59,17 @@ describe('Task Details component', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
const applicationsService = new ApplicationsUtil(apiService);
appModel = await applicationsService.importPublishDeployApp(app.file_path);
await loginPage.login(processUserModel.email, processUserModel.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/task-filters-component.e2e.ts
+6 -6
View File
@@ -47,10 +47,10 @@ describe('Task', () => {
let appId: number, user: UserModel;
beforeEach(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const { id } = await applicationsService.importPublishDeployApp(app.file_path);
appId = id;
@@ -63,7 +63,7 @@ describe('Task', () => {
afterEach(async () => {
await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
await navigationBarPage.clickLogoutButton();
});
@@ -186,10 +186,10 @@ describe('Task', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -199,7 +199,7 @@ describe('Task', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/task-filters-sorting.e2e.ts
+3 -3
View File
@@ -52,10 +52,10 @@ describe('Task Filters Sorting', () => {
{ name: 'Task 6', dueDate: '03/01/2019' }];
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
const applicationsService = new ApplicationsUtil(apiService);
const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -81,7 +81,7 @@ describe('Task Filters Sorting', () => {
});
afterAll( async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/task-list-pagination.e2e.ts
+3 -3
View File
@@ -58,10 +58,10 @@ describe('Task List Pagination', () => {
beforeAll(async () => {
const usersActions = new UsersActions(apiService);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
const applicationsService = new ApplicationsUtil(apiService);
const resultApp = await applicationsService.importPublishDeployApp(app.file_path);
@@ -73,7 +73,7 @@ describe('Task List Pagination', () => {
});
afterAll( async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/amount-widget.e2e.ts
+3 -3
View File
@@ -38,11 +38,11 @@ describe('Amount Widget', () => {
const processUtil = new ProcessUtil(apiService);
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -62,7 +62,7 @@ describe('Amount Widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/attach-file-widget.e2e.ts
+3 -3
View File
@@ -55,10 +55,10 @@ describe('Attach widget - File', () => {
const appFields = app.form_fields;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
await applicationsService.importPublishDeployApp(app.file_path);
await loginPage.login(processUserModel.email, processUserModel.password);
@@ -79,7 +79,7 @@ describe('Attach widget - File', () => {
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/attach-folder-widget.e2e.ts
+3 -3
View File
@@ -46,11 +46,11 @@ describe('Attach Folder widget', () => {
const applicationsService = new ApplicationsUtil(apiService);
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -70,7 +70,7 @@ describe('Attach Folder widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/checkbox-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Checkbox Widget', () => {
const applicationsService = new ApplicationsUtil(apiService);
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Checkbox Widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/date-time-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Date and time widget', () => {
let deployedApp, process;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Date and time widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/date-widget.e2e.ts
+3 -3
View File
@@ -49,11 +49,11 @@ describe('Date widget', () => {
const applicationsService = new ApplicationsUtil(apiService);
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -66,7 +66,7 @@ describe('Date widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/document-template-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Document Template widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp( app.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Document Template widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/dropdown-widget.e2e.ts
+3 -3
View File
@@ -44,11 +44,11 @@ describe('Dropdown widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -68,7 +68,7 @@ describe('Dropdown widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/dynamic-table-widget.e2e.ts
+9 -9
View File
@@ -49,10 +49,10 @@ describe('Dynamic Table widget ', () => {
const app = browser.params.resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -70,7 +70,7 @@ describe('Dynamic Table widget ', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
await navigationBarPage.clickLogoutButton();
});
@@ -98,10 +98,10 @@ describe('Dynamic Table widget ', () => {
const app = browser.params.resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE_USERS;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -112,7 +112,7 @@ describe('Dynamic Table widget ', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
await navigationBarPage.clickLogoutButton();
});
@@ -153,10 +153,10 @@ describe('Dynamic Table widget ', () => {
const app = browser.params.resources.Files.WIDGET_CHECK_APP;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
const application = await applicationsService.importPublishDeployApp(app.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -166,7 +166,7 @@ describe('Dynamic Table widget ', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/header-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Header widget', async () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Header widget', async () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/hyperlink-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Hyperlink widget', () => {
let deployedApp, process;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Hyperlink widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/multi-line-widget.e2e.ts
+3 -3
View File
@@ -44,11 +44,11 @@ describe('Multi-line Widget', () => {
let deployedApp, process;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -68,7 +68,7 @@ describe('Multi-line Widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/number-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Number widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Number widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/people-group-widget.e2e.ts
+3 -3
View File
@@ -37,11 +37,11 @@ describe('People and Group widget', () => {
let user: UserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await createGroupAndUsers(user.tenantId);
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
@@ -115,7 +115,7 @@ describe('People and Group widget', () => {
});
async function createGroupAndUsers(tenantId: number) {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
const userCreated = await Promise.all(app.groupUser.map(usersToCreate =>
usersActions.createUser(new UserModel({
e2e/process-services/widgets/people-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('People widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('People widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/radio-buttons-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Radio Buttons Widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -70,7 +70,7 @@ describe('Radio Buttons Widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/text-widget.e2e.ts
+3 -3
View File
@@ -45,11 +45,11 @@ describe('Text widget', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -69,7 +69,7 @@ describe('Text widget', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});
e2e/process-services/widgets/typeahead-widget.e2e.ts
+3 -3
View File
@@ -37,16 +37,16 @@ describe('Typeahead widget', () => {
let user: UserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.getInstance().login(user.email, user.password);
await apiService.login(user.email, user.password);
await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
await loginPage.login(user.email, user.password);
});
afterAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
e2e/process-services/widgets/widget-visibility-condition.e2e.ts
+3 -3
View File
@@ -67,11 +67,11 @@ describe('Process-Services - Visibility conditions', () => {
let processUserModel;
beforeAll(async () => {
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
processUserModel = await usersActions.createUser();
await apiService.getInstance().login(processUserModel.email, processUserModel.password);
await apiService.login(processUserModel.email, processUserModel.password);
appModel = await applicationsService.importPublishDeployApp(browser.params.resources.Files.WIDGET_CHECK_APP.file_path);
const appDefinitions = await apiService.getInstance().activiti.appsApi.getAppDefinitions();
@@ -91,7 +91,7 @@ describe('Process-Services - Visibility conditions', () => {
afterAll(async () => {
await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
});