[ADF-4329][ASD-5330] plus Improve e2e (#6580)

Improve e2e
Fix SSO user avatar 
Fix Priority for APS1

e2e/process-services/widgets/amount-widget.e2e.ts

@@ -56,6 +56,8 @@ describe('Amount Widget', () => {
     beforeEach(async() => {
         const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
         await BrowserActions.getUrl(urlToNavigateTo);
+        await taskPage.tasksListPage().checkTaskListIsLoaded();
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/attach-folder-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Attach Folder widget', () => {
 
@@ -35,6 +36,7 @@ describe('Attach Folder widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     let appModel;
     let deployedApp, process;
@@ -62,8 +64,9 @@ describe('Attach Folder widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/checkbox-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,7 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
 
 describe('Checkbox Widget', () => {
 
@@ -61,8 +61,7 @@ describe('Checkbox Widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/date-time-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Date and time widget', () => {
 
@@ -35,6 +36,7 @@ describe('Date and time widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Date and time widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/date-widget.e2e.ts

@@ -30,6 +30,8 @@ import { browser } from 'protractor';
 import { FormDemoPage } from '.././pages/form-demo.page';
 import { customDateFormAPS1 } from '../../resources/forms/custom-date-form';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Date widget', () => {
 
@@ -38,6 +40,7 @@ describe('Date widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const dateWidget = widget.dateWidget();
     let appModel;
@@ -72,8 +75,9 @@ describe('Date widget', () => {
 
     describe('Simple App', () => {
         beforeEach(async () => {
-            const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-            await BrowserActions.getUrl(urlToNavigateTo);
+            await navigationBarPage.clickHomeButton();
+            await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
             await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
             await taskPage.formFields().checkFormIsDisplayed();
         });

e2e/process-services/widgets/document-template-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Document Template widget', () => {
 
@@ -35,6 +36,7 @@ describe('Document Template widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Document Template widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/dropdown-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Dropdown widget', () => {
     const app = browser.params.resources.Files.WIDGET_CHECK_APP.DROPDOWN;
@@ -34,6 +35,7 @@ describe('Dropdown widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -60,8 +62,9 @@ describe('Dropdown widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/dynamic-table-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -28,6 +27,7 @@ import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
 
 describe('Dynamic Table widget ', () => {
 
@@ -62,8 +62,9 @@ describe('Dynamic Table widget ', () => {
         });
 
         beforeEach(async () => {
-            const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-            await BrowserActions.getUrl(urlToNavigateTo);
+            await navigationBarPage.clickHomeButton();
+            await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
             await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
             await taskPage.formFields().checkFormIsDisplayed();
         });
@@ -118,8 +119,9 @@ describe('Dynamic Table widget ', () => {
         });
 
         beforeEach(async () => {
-            const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-            await BrowserActions.getUrl(urlToNavigateTo);
+            await navigationBarPage.clickHomeButton();
+            await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
             await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
             await taskPage.tasksListPage().checkTaskListIsLoaded();
             await taskPage.formFields().checkFormIsDisplayed();
@@ -172,8 +174,10 @@ describe('Dynamic Table widget ', () => {
 
         beforeEach(async () => {
             await loginPage.login(processUserModel.username, processUserModel.password);
-            const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks`;
-            await BrowserActions.getUrl(urlToNavigateTo);
+
+            await navigationBarPage.clickHomeButton();
+            await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
             await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
             await taskPage.tasksListPage().checkTaskListIsLoaded();
             await taskPage.formFields().checkFormIsDisplayed();

e2e/process-services/widgets/header-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Header widget', async () => {
 
@@ -35,6 +36,7 @@ describe('Header widget', async () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Header widget', async () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/hyperlink-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Hyperlink widget', () => {
 
@@ -35,6 +36,7 @@ describe('Hyperlink widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Hyperlink widget', () => {
     });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/multi-line-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Multi-line Widget', () => {
     const app = browser.params.resources.Files.WIDGET_CHECK_APP.MULTILINE_TEXT;
@@ -34,6 +35,7 @@ describe('Multi-line Widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -60,8 +62,9 @@ describe('Multi-line Widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/number-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Number widget', () => {
 
@@ -35,6 +36,7 @@ describe('Number widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Number widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/people-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('People widget', () => {
 
@@ -35,6 +36,7 @@ describe('People widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('People widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/radio-buttons-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
+import { ProcessServicesPage } from '../pages/process-services.page';
 
 describe('Radio Buttons Widget', () => {
 
@@ -35,6 +36,7 @@ describe('Radio Buttons Widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -62,8 +64,9 @@ describe('Radio Buttons Widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });

e2e/process-services/widgets/text-widget.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import CONSTANTS = require('../../util/constants');
+import { ProcessServicesPage } from '../pages/process-services.page';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Text widget', () => {
 
@@ -35,6 +36,7 @@ describe('Text widget', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -61,8 +63,9 @@ describe('Text widget', () => {
    });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
+
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });
@@ -84,12 +87,15 @@ describe('Text widget', () => {
     });
 
     it('[C268170] Min-max length properties', async () => {
+        await widget.textWidget().setValue(app.FIELD.simpleText, 'TEST');
         await widget.textWidget().setValue(app.FIELD.textMinMax, 'A');
         await expect(await widget.textWidget().getErrorMessage(app.FIELD.textMinMax)).toContain('Enter at least 4 characters');
         await expect(await taskPage.formFields().isCompleteFormButtonEnabled()).toEqual(false);
-        await widget.textWidget().setValue(app.FIELD.textMinMax, 'AAAAAAAAAAA');
+        await widget.textWidget().setValue(app.FIELD.textMinMax, '01234567890');
         await expect(await widget.textWidget().getErrorMessage(app.FIELD.textMinMax)).toContain('Enter no more than 10 characters');
         await expect(await taskPage.formFields().isCompleteFormButtonEnabled()).toEqual(false);
+        await widget.textWidget().setValue(app.FIELD.textMinMax, '123456789');
+        await expect(await taskPage.formFields().isCompleteFormButtonEnabled()).toEqual(true);
     });
 
     it('[C268171] Input mask reversed checkbox properties', async () => {

e2e/process-services/widgets/widget-visibility-condition.e2e.ts

@@ -18,7 +18,6 @@
 import {
     ApiService,
     ApplicationsUtil,
-    BrowserActions,
     LoginPage,
     ProcessUtil,
     UsersActions,
@@ -27,6 +26,8 @@ import {
 import { browser } from 'protractor';
 import { TasksPage } from '../pages/tasks.page';
 import CONSTANTS = require('../../util/constants');
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
+import { ProcessServicesPage } from '../pages/process-services.page';
 
 const widgets = {
     textOneId: 'text1',
@@ -57,6 +58,7 @@ describe('Process-Services - Visibility conditions', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
     const widget = new Widget();
+    const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
@@ -83,8 +85,8 @@ describe('Process-Services - Visibility conditions', () => {
     });
 
     beforeEach(async () => {
-        const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`;
-        await BrowserActions.getUrl(urlToNavigateTo);
+        await navigationBarPage.clickHomeButton();
+        await (new ProcessServicesPage()).goToAppByAppId(deployedApp.id);
         await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
         await taskPage.formFields().checkFormIsDisplayed();
     });
@@ -113,17 +115,6 @@ describe('Process-Services - Visibility conditions', () => {
         await widget.checkboxWidget().isCheckboxHidden(checkbox.checkboxVariableField);
     });
 
-    it('[C309649] Should be able to see Checkbox widget when visibility condition refers to a field and a form variable', async () => {
-        await widget.textWidget().isWidgetVisible(widgets.textOneId);
-        await widget.checkboxWidget().isCheckboxHidden(checkbox.checkboxFieldVariable);
-
-        await widget.textWidget().setValue(widgets.textOneId, value.displayFieldVariableCheckbox);
-        await widget.checkboxWidget().isCheckboxDisplayed(checkbox.checkboxFieldVariable);
-
-        await widget.textWidget().setValue(widgets.textOneId, value.notDisplayCheckbox);
-        await widget.checkboxWidget().isCheckboxHidden(checkbox.checkboxFieldVariable);
-    });
-
     it('[C311425] Should be able to see Checkbox widget when visibility condition refers to a field and another field', async () => {
         await widget.textWidget().isWidgetVisible(widgets.textOneId);
         await widget.checkboxWidget().isCheckboxDisplayed(checkbox.checkboxFieldField);
@@ -135,6 +126,17 @@ describe('Process-Services - Visibility conditions', () => {
         await widget.checkboxWidget().isCheckboxDisplayed(checkbox.checkboxFieldField);
     });
 
+    it('[C309649] Should be able to see Checkbox widget when visibility condition refers to a field and a form variable', async () => {
+        await widget.textWidget().isWidgetVisible(widgets.textOneId);
+        await widget.checkboxWidget().isCheckboxHidden(checkbox.checkboxFieldVariable);
+
+        await widget.textWidget().setValue(widgets.textOneId, value.displayFieldVariableCheckbox);
+        await widget.checkboxWidget().isCheckboxDisplayed(checkbox.checkboxFieldVariable);
+
+        await widget.textWidget().setValue(widgets.textOneId, value.notDisplayCheckbox);
+        await widget.checkboxWidget().isCheckboxHidden(checkbox.checkboxFieldVariable);
+    });
+
     it('[C311424] Should be able to see Checkbox widget when visibility condition refers to a variable with specific value', async () => {
         await widget.checkboxWidget().isCheckboxDisplayed(checkbox.checkboxVariableValue);
     });