Unify hash url strategy (#5866)

* unify hash url startegy

* improve

e2e/content-services/about-content-services.component.e2e.ts

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AboutPage, ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { AboutPage, ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('About Content Services', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const aboutPage = new AboutPage();
     let acsUser: UserModel;

e2e/content-services/comments/comment-component.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -33,7 +33,7 @@ import CONSTANTS = require('../../util/constants');
 
 describe('Comment Component', () => {
 
-    const loginPage: LoginSSOPage = new LoginSSOPage();
+    const loginPage: LoginPage = new LoginPage();
     const contentServicesPage: ContentServicesPage = new ContentServicesPage();
     const viewerPage: ViewerPage = new ViewerPage();
     const commentsPage: CommentsPage = new CommentsPage();

e2e/content-services/directives/create-folder-directive.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UserModel,
@@ -31,7 +31,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Create folder directive', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const createFolderDialog = new FolderDialogPage();
     const notificationHistoryPage = new NotificationHistoryPage();

e2e/content-services/directives/create-library-directive.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, BrowserActions, LoginSSOPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { CreateLibraryDialogPage } from '../../pages/adf/dialog/create-library-dialog.page';
 import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page';
@@ -24,7 +24,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Create library directive', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const createLibraryDialog = new CreateLibraryDialogPage();
     const customSourcesPage = new CustomSourcesPage();

e2e/content-services/directives/delete-directive.e2e.ts

@@ -20,7 +20,7 @@ import { FileModel } from '../../models/ACS/file.model';
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     PermissionActions,
     StringUtil,
@@ -34,7 +34,7 @@ import { FolderModel } from '../../models/ACS/folder.model';
 describe('Delete Directive', () => {
 
     const apiService = new ApiService();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const paginationPage = new PaginationPage();
     const contentListPage = contentServicesPage.getDocumentList();

e2e/content-services/directives/download-directive.e2e.ts

@@ -21,7 +21,7 @@ import {
     ApiService,
     BrowserVisibility,
     FileBrowserUtil,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -32,7 +32,7 @@ import { FolderModel } from '../../models/ACS/folder.model';
 
 describe('Version component actions', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const contentListPage = contentServicesPage.getDocumentList();

e2e/content-services/directives/edit-folder-directive.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -33,7 +33,7 @@ import { FileModel } from '../../models/ACS/file.model';
 
 describe('Edit folder directive', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const editFolderDialog = new FolderDialogPage();
     const acsUser = new UserModel();
@@ -229,7 +229,7 @@ describe('Edit folder directive', () => {
     describe('Edit Folder - no permission', () => {
         beforeEach(async () => {
             await loginPage.login(anotherAcsUser.email, anotherAcsUser.password);
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + editFolder.entry.id);
+            await BrowserActions.getUrl(browser.baseUrl + '/files/' + editFolder.entry.id);
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
         });
 

e2e/content-services/directives/favorite-directive.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     ContentNodeSelectorDialogPage,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ import { TrashcanPage } from '../../pages/adf/trashcan.page';
 
 describe('Favorite directive', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     let acsUser: UserModel;

e2e/content-services/directives/restore-content-directive.e2e.ts

@@ -25,7 +25,7 @@ import {
     ApiService,
     BreadcrumbPage,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -35,7 +35,7 @@ import {
 
 describe('Restore content directive', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const acsUser = new UserModel();

e2e/content-services/document-list/document-list-actions.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     BreadcrumbPage,
     ContentNodeSelectorDialogPage,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     StringUtil,
     UploadActions,
@@ -37,7 +37,7 @@ import { FolderModel } from '../../models/ACS/folder.model';
 
 describe('Document List Component - Actions', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const contentListPage = contentServicesPage.getDocumentList();

e2e/content-services/document-list/document-list-component.e2e.ts

@@ -17,13 +17,13 @@
 
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import moment from 'moment-es6';
 
 describe('Document List Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     let uploadedFolder, uploadedFolderExtra;
     const apiService = new ApiService();

e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     BrowserActions,
     ContentNodeSelectorDialogPage,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -34,7 +34,7 @@ import CONSTANTS = require('../../util/constants');
 
 describe('Document List Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
@@ -208,7 +208,7 @@ describe('Document List Component', () => {
     describe('Document List actionns - Move, Copy on no permission folder', () => {
         beforeAll(async () => {
             await loginPage.login(anotherAcsUser.email, anotherAcsUser.password);
-            await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/files/${sourceFolder.entry.id}`);
+            await BrowserActions.getUrl(`${browser.baseUrl}/files/${sourceFolder.entry.id}`);
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
         });
 
@@ -269,7 +269,7 @@ describe('Document List Component', () => {
             await contentServicesPage.checkDeleteIsDisabled(pdfFileModel.name);
 
             await loginPage.login(acsUser.email, acsUser.password);
-            await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/files/${sourceFolder.entry.id}`);
+            await BrowserActions.getUrl(`${browser.baseUrl}/files/${sourceFolder.entry.id}`);
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
 
             await contentServicesPage.checkContentIsDisplayed(pdfFileModel.name);

e2e/content-services/document-list/document-list-gallery.e2e.ts

@@ -17,13 +17,13 @@
 
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Document List Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);

e2e/content-services/document-list/document-list-pagination.e2e.ts

@@ -20,7 +20,7 @@ import {
     ArrayUtil,
     FileBrowserUtil,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     StringUtil,
     UploadActions,
@@ -55,7 +55,7 @@ describe('Document List - Pagination', () => {
         default: '25'
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const paginationPage = new PaginationPage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/document-list/document-list-permissions.e2e.ts

@@ -18,11 +18,11 @@
 import { browser } from 'protractor';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
-import { ApiService, BrowserActions, ErrorPage, LoginSSOPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, BrowserActions, ErrorPage, LoginPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
 
 describe('Document List Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const errorPage = new ErrorPage();
     const navigationBarPage = new NavigationBarPage();
@@ -52,7 +52,7 @@ describe('Document List Component', () => {
         });
 
         it('[C217334] Should display a message when accessing file without permissions', async () => {
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid);
+            await BrowserActions.getUrl(browser.baseUrl + '/files/' + privateSite.entry.guid);
             await expect(await errorPage.getErrorCode()).toBe('403');
             await expect(await errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
         });
@@ -60,7 +60,7 @@ describe('Document List Component', () => {
         it('[C279924] Should display custom message when accessing a file without permissions', async () => {
             await contentServicesPage.goToDocumentList();
             await contentServicesPage.enableCustomPermissionMessage();
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid);
+            await BrowserActions.getUrl(browser.baseUrl + '/files/' + privateSite.entry.guid);
             await expect(await errorPage.getErrorCode()).toBe('403');
         });
    });

e2e/content-services/document-list/document-list-properties.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, DropActions, LoginSSOPage, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, DropActions, LoginPage, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { browser } from 'protractor';
@@ -23,7 +23,7 @@ import { FileModel } from '../../models/ACS/file.model';
 
 describe('Document List Component - Properties', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBar = new NavigationBarPage();
 

e2e/content-services/document-list/document-list-selection.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { FolderModel } from '../../models/ACS/folder.model';
@@ -24,7 +24,7 @@ import { FileModel } from '../../models/ACS/file.model';
 import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
 
 describe('Document List - Selection', () => {
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const uploadDialog = new UploadDialogPage();

e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts

@@ -17,13 +17,13 @@
 
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Document List Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     let uploadedFolder, uploadedFolderExtra;
     const apiService = new ApiService();

e2e/content-services/lock-file.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { ContentServicesPage } from '../pages/adf/content-services.page';
 import { LockFilePage } from '../pages/adf/lock-file.page';
@@ -25,7 +25,7 @@ import CONSTANTS = require('../util/constants');
 
 describe('Lock File', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const lockFilePage = new LockFilePage();
     const contentServices = new ContentServicesPage();

e2e/content-services/metadata/aspect-oriented-config.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     CheckboxPage,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions,
@@ -33,7 +33,7 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page';
 
 describe('Aspect oriented config', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const viewerPage = new ViewerPage();
     const metadataViewPage = new MetadataViewPage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/metadata/metadata-permissions.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -45,7 +45,7 @@ describe('permissions', () => {
         EDIT_BUTTON_TOOLTIP: 'Edit'
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const viewerPage = new ViewerPage();
     const metadataViewPage = new MetadataViewPage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/metadata/metadata-properties.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     CheckboxPage,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions,
@@ -45,7 +45,7 @@ describe('CardView Component - properties', () => {
         EDIT_BUTTON_TOOLTIP: 'Edit'
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const viewerPage = new ViewerPage();
     const metadataViewPage = new MetadataViewPage();

e2e/content-services/metadata/metadata-smoke-tests.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -48,7 +48,7 @@ describe('Metadata component', () => {
         EDIT_BUTTON_TOOLTIP: 'Edit'
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const viewerPage = new ViewerPage();
     const metadataViewPage = new MetadataViewPage();
@@ -264,7 +264,7 @@ describe('Metadata component', () => {
     it('[C279960] Should show the last username modifier when modify a File', async () => {
         await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
 
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/(overlay:files/${pngFileModel.id}/view)`);
+        await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${pngFileModel.id}/view)`);
 
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();

e2e/content-services/permissions/permissions-component.e2e.ts

@@ -21,7 +21,7 @@ import { FileModel } from '../../models/ACS/file.model';
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -38,7 +38,7 @@ import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
 describe('Permissions Component', () => {
 
     const apiService = new ApiService();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const permissionsPage = new PermissionsPage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/permissions/site-permissions.e2e.ts

@@ -19,7 +19,7 @@ import { PermissionsPage } from '../../pages/adf/permissions.page';
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -39,7 +39,7 @@ import CONSTANTS = require('../../util/constants');
 describe('Permissions Component', () => {
 
     const apiService = new ApiService();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const permissionsPage = new PermissionsPage();
     const uploadActions = new UploadActions(apiService);
@@ -164,7 +164,7 @@ describe('Permissions Component', () => {
         beforeAll(async () => {
             await loginPage.login(folderOwnerUser.email, folderOwnerUser.password);
 
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + publicSite.entry.guid);
+            await BrowserActions.getUrl(browser.baseUrl + '/files/' + publicSite.entry.guid);
         });
 
         it('[C277002] Should display the Role Site dropdown', async () => {

e2e/content-services/share-file/share-file.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiUtil,
     BrowserActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     UploadActions,
     UserModel,
@@ -39,7 +39,7 @@ describe('Share file', () => {
 
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const contentListPage = contentServicesPage.getDocumentList();
     const shareDialog = new ShareDialogPage();

e2e/content-services/share-file/unshare-file.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     BrowserActions,
     ErrorPage,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -36,7 +36,7 @@ import { browser } from 'protractor';
 describe('Unshare file', () => {
 
     const apiService = new ApiService();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const contentListPage = contentServicesPage.getDocumentList();
     const navBar = new NavigationBarPage();
@@ -160,7 +160,7 @@ describe('Unshare file', () => {
             await shareDialog.confirmationDialogIsDisplayed();
             await shareDialog.clickConfirmationDialogRemoveButton();
             await shareDialog.dialogIsClosed();
-            await BrowserActions.getUrl(sharedLink.replace(browser.params.testConfig.appConfig.ecmHost, browser.params.testConfig.adf.host));
+            await BrowserActions.getUrl(sharedLink.replace(browser.params.testConfig.appConfig.ecmHost, browser.baseUrl ));
             await errorPage.checkErrorCode();
         });
     });

e2e/content-services/social/social.component.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     LikePage,
-    LoginSSOPage,
+    LoginPage,
     RatePage,
     UploadActions,
     UserModel,
@@ -31,7 +31,7 @@ import { browser } from 'protractor';
 
 describe('Social component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const likePage = new LikePage();
     const ratePage = new RatePage();
     const socialPage = new SocialPage();

e2e/content-services/sso/sso-download-directive-component.e2e.ts

@@ -22,7 +22,7 @@ import {
     ApiService,
     FileBrowserUtil,
     IdentityService,
-    LoginSSOPage,
+    LoginPage,
     SettingsPage,
     StringUtil,
     UploadActions,
@@ -37,7 +37,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
     const navigationBarPage = new NavigationBarPage();
     const contentServicesPage = new ContentServicesPage();
     const contentListPage = contentServicesPage.getDocumentList();
-    const loginSsoPage = new LoginSSOPage();
+    const loginSsoPage = new LoginPage();
     const viewerPage = new ViewerPage();
 
     const apiService = new ApiService({ authType: 'OAUTH' });

e2e/content-services/tag-component.e2e.ts

@@ -16,14 +16,14 @@
  */
 
 import { FileModel } from '../models/ACS/file.model';
-import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { TagPage } from '../pages/adf/tag.page';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { browser } from 'protractor';
 
 describe('Tag component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const tagPage = new TagPage();
     const navigationBarPage = new NavigationBarPage();
 

e2e/content-services/trashcan-pagination.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     StringUtil,
     UploadActions,
@@ -47,7 +47,7 @@ describe('Trashcan - Pagination', () => {
         default: '25'
     };
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const trashcanPage = new TrashcanPage();
     const paginationPage = new PaginationPage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/tree-view-component.e2e.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { TreeViewPage } from '../pages/adf/content-services/tree-view.page';
 import { browser } from 'protractor';
 
 describe('Tree View Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const treeViewPage = new TreeViewPage();
 

e2e/content-services/upload/cancel-upload.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
 import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page';
@@ -28,7 +28,7 @@ describe('Upload component', async () => {
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
     const uploadToggles = new UploadTogglesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/content-services/upload/excluded-file.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     DropActions,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     UserModel,
     UsersActions
 } from '@alfresco/adf-testing';
@@ -36,7 +36,7 @@ describe('Upload component - Excluded Files', () => {
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
     const uploadToggles = new UploadTogglesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);

e2e/content-services/upload/upload-dialog.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -36,7 +36,7 @@ describe('Upload component', () => {
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
     const uploadToggles = new UploadTogglesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const versionManagePage = new VersionManagePage();
     const apiService = new ApiService();
 

e2e/content-services/upload/uploader-component.e2e.ts

@@ -20,7 +20,7 @@ import { browser, by, element } from 'protractor';
 import {
     ApiService,
     DropActions,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -37,7 +37,7 @@ describe('Upload component', () => {
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
     const uploadToggles = new UploadTogglesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
 
     const apiService = new ApiService();

e2e/content-services/upload/user-permission.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -27,7 +27,7 @@ describe('Upload - User permission', () => {
 
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const notificationHistoryPage = new NotificationHistoryPage();
     const apiService = new ApiService();

e2e/content-services/version/version-actions.e2e.ts

@@ -20,7 +20,7 @@ import {
     BrowserActions,
     BrowserVisibility,
     FileBrowserUtil,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -34,7 +34,7 @@ import { VersionManagePage } from '../../pages/adf/version-manager.page';
 
 describe('Version component actions', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const versionManagePage = new VersionManagePage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/version/version-permissions.e2e.ts

@@ -19,7 +19,7 @@ import { browser, by, element } from 'protractor';
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     StringUtil,
     UploadActions,
@@ -35,7 +35,7 @@ import CONSTANTS = require('../../util/constants');
 
 describe('Version component permissions', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const versionManagePage = new VersionManagePage();
     const navigationBarPage = new NavigationBarPage();
     const uploadDialog = new UploadDialogPage();

e2e/content-services/version/version-properties.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     BrowserActions,
     BrowserVisibility,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -32,7 +32,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Version Properties', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const versionManagePage = new VersionManagePage();
     const navigationBarPage = new NavigationBarPage();

e2e/content-services/version/version-smoke-tests.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     BrowserActions,
     BrowserVisibility,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions
@@ -33,7 +33,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 describe('Version component', () => {
 
     let txtUploadedFile;
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const versionManagePage = new VersionManagePage();

e2e/core/datatable/data-table-component-selection.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, DataTableComponentPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -26,7 +26,7 @@ describe('Datatable component - selection', () => {
     const usersActions = new UsersActions(apiService);
 
     const dataTablePage = new DataTablePage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const acsUser = new UserModel();
     const navigationBarPage = new NavigationBarPage();
     const dataTableComponent = new DataTableComponentPage();

e2e/core/datatable/data-table-component.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     DropActions,
-    LoginSSOPage,
+    LoginPage,
     NotificationHistoryPage,
     UserModel,
     UsersActions
@@ -33,7 +33,7 @@ describe('Datatable component', () => {
     const dataTablePage = new DataTablePage('defaultTable');
     const copyContentDataTablePage = new DataTablePage('copyClipboardDataTable');
     const dragAndDropDataTablePage = new DataTablePage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const acsUser = new UserModel();
     const navigationBarPage = new NavigationBarPage();
     const notificationHistoryPage = new NotificationHistoryPage();

e2e/core/error-component.e2e.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { ApiService, BrowserActions, ErrorPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, BrowserActions, ErrorPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('Error Component', () => {
 
     const acsUser = new UserModel();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const errorPage = new ErrorPage();
     const navigationBarPage = new NavigationBarPage();
 
@@ -40,21 +40,21 @@ describe('Error Component', () => {
     });
 
     it('[C277302] Should display the error 403 when access to unauthorized page - My Change', async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403');
+        await BrowserActions.getUrl(browser.baseUrl + '/error/403');
         await expect(await errorPage.getErrorCode()).toBe('403');
         await expect(await errorPage.getErrorTitle()).toBe('You don\'t have permission to access this server.');
         await expect(await errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
     });
 
     it('[C277304] Should display the error 404 when access to not found page', async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404');
+        await BrowserActions.getUrl(browser.baseUrl + '/error/404');
         await expect(await errorPage.getErrorCode()).toBe('404');
         await expect(await errorPage.getErrorTitle()).toBe('An error occurred.');
         await expect(await errorPage.getErrorDescription()).toBe('We couldn’t find the page you were looking for.');
     });
 
     it('[C307029] Should display Unknown message when error is undefined', async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/501');
+        await BrowserActions.getUrl(browser.baseUrl + '/error/501');
         await expect(await errorPage.getErrorCode()).toBe('UNKNOWN');
         await expect(await errorPage.getErrorTitle()).toBe('We hit a problem.');
         await expect(await errorPage.getErrorDescription()).toBe('Looks like something went wrong.');

e2e/core/header-component.e2e.ts

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ApiService, HeaderPage, LoginSSOPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, HeaderPage, LoginPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('Header Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const headerPage = new HeaderPage();
     const settingsPage = new SettingsPage();

e2e/core/icons-component.e2e.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { IconsPage } from '../pages/adf/icons.page';
 import { browser } from 'protractor';
 
 describe('Universal Icon component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const acsUser = new UserModel();
     const navigationBarPage = new NavigationBarPage();
     const iconsPage = new IconsPage();

e2e/core/infinite-scrolling.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -32,7 +32,7 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('Enable infinite scrolling', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const infinitePaginationPage = new InfinitePaginationPage();
     const navigationBarPage = new NavigationBarPage();

e2e/core/login/login-component.e2e.ts

@@ -28,7 +28,7 @@ import { browser } from 'protractor';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page';
-import { LoginPage } from '../../pages/adf/demo-shell/login.page';
+import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
 
 describe('Login component', () => {
 
@@ -36,7 +36,7 @@ describe('Login component', () => {
     const navigationBarPage = new NavigationBarPage();
     const userInfoPage = new UserInfoPage();
     const contentServicesPage = new ContentServicesPage();
-    const loginPage = new LoginPage();
+    const loginPage = new LoginShellPage();
     const errorPage = new ErrorPage();
 
     const userA = new UserModel();
@@ -192,7 +192,7 @@ describe('Login component', () => {
         await loginPage.goToLoginPage();
         await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
         await browser.executeScript('window.localStorage.removeItem("ADF_ticket-ECM");');
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
+        await BrowserActions.getUrl(browser.baseUrl + '/files');
         await loginPage.waitForElements();
 
         await LocalStorageUtil.setStorageItem('providers', 'ALL');
@@ -210,7 +210,7 @@ describe('Login component', () => {
         await loginPage.goToLoginPage();
         await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
         await browser.executeScript('window.localStorage.removeItem("ADF_ticket-BPM");');
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
+        await BrowserActions.getUrl(browser.baseUrl + '/activiti');
         await loginPage.waitForElements();
     });
 
@@ -222,9 +222,9 @@ describe('Login component', () => {
 
         const handles = await browser.getAllWindowHandles();
         await browser.switchTo().window(handles[1]);
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
+        await BrowserActions.getUrl(browser.baseUrl + '/activiti');
         await processServicesPage.checkApsContainer();
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
+        await BrowserActions.getUrl(browser.baseUrl + '/files');
         await contentServicesPage.checkAcsContainer();
     });
 

e2e/core/login/login-sso/login-sso.e2e.ts

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-import { LoginSSOPage, SettingsPage, BrowserVisibility } from '@alfresco/adf-testing';
+import { LoginPage, SettingsPage, BrowserVisibility } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page';
-import { LoginPage } from '../../../pages/adf/demo-shell/login.page';
+import { LoginShellPage } from '../../../pages/adf/demo-shell/login-shell.page';
 
 describe('Login component - SSO', () => {
 
     const settingsPage = new SettingsPage();
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
-    const loginPage = new LoginPage();
+    const loginPage = new LoginShellPage();
     const navigationBarPage = new NavigationBarPage();
 
     describe('Login component - SSO implicit Flow', () => {

e2e/core/login/login-sso/logout-sso.e2e.ts

@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
+import { LoginPage, SettingsPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page';
 
 describe('Logout component - SSO', () => {
 
     const settingsPage = new SettingsPage();
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
 
     it('[C280665] Should be possible change the logout redirect URL', async () => {
-        await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
+        await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost,
             browser.params.testConfig.appConfig.oauth2.host,
             browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId, '/login');
         await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
@@ -35,6 +35,6 @@ describe('Logout component - SSO', () => {
         await browser.sleep(2000);
 
         const actualUrl = await browser.getCurrentUrl();
-        await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/login');
+        await expect(actualUrl).toEqual(browser.baseUrl + '/login');
     });
 });

e2e/core/login/redirection.e2e.ts

@@ -29,7 +29,7 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { LogoutPage } from '../../pages/adf/demo-shell/logout.page';
-import { LoginPage } from '../../pages/adf/demo-shell/login.page';
+import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
 
 describe('Login component - Redirect', () => {
 
@@ -37,7 +37,7 @@ describe('Login component - Redirect', () => {
     const processServicesPage = new ProcessServicesPage();
     const navigationBarPage = new NavigationBarPage();
     const contentServicesPage = new ContentServicesPage();
-    const loginPage = new LoginPage();
+    const loginPage = new LoginShellPage();
     const logoutPage = new LogoutPage();
 
     let user;
@@ -118,7 +118,7 @@ describe('Login component - Redirect', () => {
         await navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
 
         let actualUrl = await browser.getCurrentUrl();
-        await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+        await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
 
         await contentServicesPage.waitForTableBody();
 
@@ -133,7 +133,7 @@ describe('Login component - Redirect', () => {
         await loginPage.login(user.email, user.password);
 
         actualUrl = await browser.getCurrentUrl();
-        await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+        await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
     });
 
     it('[C299161] Should redirect user to requested URL after reloading login page', async () => {
@@ -145,7 +145,7 @@ describe('Login component - Redirect', () => {
         await navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
 
         const currentUrl = await browser.getCurrentUrl();
-        await expect(currentUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+        await expect(currentUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
 
         await contentServicesPage.waitForTableBody();
 
@@ -165,6 +165,6 @@ describe('Login component - Redirect', () => {
         await navigationBarPage.checkMenuButtonIsDisplayed();
 
         const actualUrl = await browser.getCurrentUrl();
-        await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
+        await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
     });
 });

e2e/core/login/remember-me.e2e.ts

@@ -16,12 +16,12 @@
  */
 
 import { SettingsPage } from '@alfresco/adf-testing';
-import { LoginPage } from '../../pages/adf/demo-shell/login.page';
+import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
 
 describe('Login component - Remember Me', () => {
 
     const settingsPage = new SettingsPage();
-    const loginPage = new LoginPage();
+    const loginPage = new LoginShellPage();
 
     beforeAll(async () => {
         await loginPage.goToLoginPage();

e2e/core/notifications-component.e2e.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NotificationDemoPage } from '../pages/adf/demo-shell/notification.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('Notifications Component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const notificationPage = new NotificationDemoPage();
     const navigationBarPage = new NavigationBarPage();
     const apiService = new ApiService();

e2e/core/pagination-empty-current-page.e2e.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     ArrayUtil,
-    LoginSSOPage,
+    LoginPage,
     PaginationPage,
     StringUtil,
     UploadActions,
@@ -33,7 +33,7 @@ import { ContentServicesPage } from '../pages/adf/content-services.page';
 
 describe('Pagination - returns to previous page when current is empty', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const paginationPage = new PaginationPage();
 

e2e/core/settings-component.e2e.ts

@@ -20,11 +20,11 @@ import { browser, protractor } from 'protractor';
 import { ContentServicesPage } from '../pages/adf/content-services.page';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page';
-import { LoginPage } from '../pages/adf/demo-shell/login.page';
+import { LoginShellPage } from '../pages/adf/demo-shell/login-shell.page';
 
 describe('Settings component', () => {
 
-    const loginPage = new LoginPage();
+    const loginPage = new LoginShellPage();
     const settingsPage = new SettingsPage();
     const navigationBarPage = new NavigationBarPage();
     const processServicesPage = new ProcessServicesPage();
@@ -143,7 +143,7 @@ describe('Settings component', () => {
             await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
             await settingsPage.clickBackButton();
             await loginPage.waitForElements();
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
+            await BrowserActions.getUrl(browser.baseUrl + '/activiti');
             await processServicesPage.checkApsContainer();
             await processServicesPage.checkAppIsDisplayed('Task App');
         });
@@ -171,7 +171,7 @@ describe('Settings component', () => {
             await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
             await settingsPage.clickBackButton();
             await loginPage.waitForElements();
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
+            await BrowserActions.getUrl(browser.baseUrl + '/files');
             await contentServicesPage.checkAcsContainer();
         });
 
@@ -202,9 +202,9 @@ describe('Settings component', () => {
             await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
             await settingsPage.clickBackButton();
             await loginPage.waitForElements();
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
+            await BrowserActions.getUrl(browser.baseUrl + '/files');
             await contentServicesPage.checkAcsContainer();
-            await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
+            await BrowserActions.getUrl(browser.baseUrl + '/activiti');
             await processServicesPage.checkApsContainer();
             await processServicesPage.checkAppIsDisplayed('Task App');
         });

e2e/core/user-info-component-cloud.e2e.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 
 describe('User Info - SSO', () => {
 
     const settingsPage = new SettingsPage();
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const userInfoPage = new UserInfoPage();
 
     const apiService = new ApiService({ authType: 'OAUTH', provider: 'ECM' });
@@ -34,7 +34,7 @@ describe('User Info - SSO', () => {
 
         identityUser = await usersActions.createUser();
 
-        await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
+        await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost,
             browser.params.testConfig.appConfig.oauth2.host,
             browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId);
 

e2e/core/user-info-component.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { PeopleApi } from '@alfresco/js-api';
-import { ApiService, LocalStorageUtil, LoginSSOPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LocalStorageUtil, LoginPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { FileModel } from '../models/ACS/file.model';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ import * as fs from 'fs';
 
 describe('User Info component', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const userInfoPage = new UserInfoPage();
     const navigationBarPage = new NavigationBarPage();
 

e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -33,7 +33,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 

e2e/core/viewer/file-extensions/viewer-component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 

e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     let site;
     const acsUser = new UserModel();

e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
     const apiService = new ApiService();

e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
     const apiService = new ApiService();

e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
     const apiService = new ApiService();

e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -33,7 +33,7 @@ import CONSTANTS = require('../../../util/constants');
 describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 

e2e/core/viewer/info-drawer.component.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -34,7 +34,7 @@ describe('Info Drawer', () => {
 
     const viewerPage = new ViewerPage();
     const navigationBarPage = new NavigationBarPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
     const apiService = new ApiService();

e2e/core/viewer/viewer-content-services-component.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ describe('Content Services Viewer', () => {
     const acsUser = new UserModel();
     const viewerPage = new ViewerPage();
     const contentServicesPage = new ContentServicesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
 
     let zoom;

e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ describe('Viewer', () => {
 
     const navigationBarPage = new NavigationBarPage();
     const viewerPage = new ViewerPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
     const apiService = new ApiService();

e2e/core/viewer/viewer-properties.e2e.ts

@@ -19,7 +19,7 @@ import { browser } from 'protractor';
 import {
     ApiService,
     DataTableComponentPage,
-    LoginSSOPage,
+    LoginPage,
     UploadActions,
     UserModel,
     UsersActions,
@@ -34,7 +34,7 @@ describe('Viewer - properties', () => {
     const acsUser = new UserModel();
     const viewerPage = new ViewerPage();
     const contentServicesPage = new ContentServicesPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const dataTable = new DataTableComponentPage();
 

e2e/core/viewer/viewer-share-content.ts

@@ -18,7 +18,7 @@
 import {
     ApiService,
     BrowserActions,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     UploadActions,
     UserModel,
@@ -36,7 +36,7 @@ describe('Viewer', () => {
 
     const viewerPage = new ViewerPage();
     const navigationBarPage = new NavigationBarPage();
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const shareDialog = new ShareDialogPage();
 
@@ -97,11 +97,11 @@ describe('Viewer', () => {
     });
 
     it('[C260105] Should be able to open an image file shared via API', async () => {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
+        await BrowserActions.getUrl(browser.baseUrl + '/preview/s/' + pngFileShared.entry.id);
         await viewerPage.checkImgContainerIsDisplayed();
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url);
+        await BrowserActions.getUrl(browser.baseUrl);
         await navigationBarPage.clickLogoutButton();
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
+        await BrowserActions.getUrl(browser.baseUrl + '/preview/s/' + pngFileShared.entry.id);
         await viewerPage.checkImgContainerIsDisplayed();
     });
 
@@ -119,7 +119,7 @@ describe('Viewer', () => {
         await viewerPage.checkFileIsLoaded();
         await viewerPage.checkFileNameIsDisplayed(wordFileInfo.name);
 
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url);
+        await BrowserActions.getUrl(browser.baseUrl);
         await navigationBarPage.clickLogoutButton();
         await BrowserActions.getUrl(sharedLink);
         await viewerPage.checkFileIsLoaded();

e2e/insights/analytics-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { AnalyticsPage } from '../pages/adf/process-services/analytics.page';
 import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page';
@@ -24,7 +24,7 @@ import { browser } from 'protractor';
 
 describe('Analytics Smoke Test', () => {
 
-    const loginPage = new LoginSSOPage();
+    const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
     const analyticsPage = new AnalyticsPage();

e2e/pages/adf/demo-shell/login-shell.page.ts

@@ -16,12 +16,12 @@
  */
 
 import { browser, by, element } from 'protractor';
-import { TogglePage, BrowserActions, BrowserVisibility, LoginSSOPage } from '@alfresco/adf-testing';
+import { TogglePage, BrowserActions, BrowserVisibility, LoginPage } from '@alfresco/adf-testing';
 
-export class LoginPage {
+export class LoginShellPage {
 
     loginURL = browser.baseUrl + '/login';
-    loginSSOPage = new LoginSSOPage();
+    loginSSOPage = new LoginPage();
 
     togglePage = new TogglePage();
     txtUsername = element(by.css('input[id="username"]'));

e2e/pages/adf/navigation-bar.page.ts

@@ -191,7 +191,7 @@ export class NavigationBarPage {
     }
 
     async openContentServicesFolder(folderId): Promise<void> {
-        await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/files/${folderId}`);
+        await BrowserActions.getUrl(`${browser.baseUrl}/files/${folderId}`);
     }
 
     async openLanguageMenu(): Promise<void> {
@@ -234,11 +234,11 @@ export class NavigationBarPage {
     }
 
     async openViewer(nodeId: string): Promise<void> {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files(overlay:files/${nodeId}/view`);
+        await BrowserActions.getUrl(browser.baseUrl + `/files(overlay:files/${nodeId}/view`);
     }
 
     async goToSite(site): Promise<void> {
-        await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files/${site.entry.guid}/display/list`);
+        await BrowserActions.getUrl(browser.baseUrl + `/files/${site.entry.guid}/display/list`);
     }
 
     async scrollTo(el: ElementFinder): Promise<void> {

e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { ApiService, IdentityService, AboutPage, LoginSSOPage } from '@alfresco/adf-testing';
+import { ApiService, IdentityService, AboutPage, LoginPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
 describe('About Process Services Cloud', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const aboutPage = new AboutPage();
 

e2e/process-services-cloud/apps-section-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing';
+import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 
@@ -23,7 +23,7 @@ describe('Applications list', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudPage = new AppListCloudPage();
 

e2e/process-services-cloud/edit-process-filters-component.e2e.ts

@@ -20,7 +20,7 @@ import {
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
-    LoginSSOPage
+    LoginPage
 } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
@@ -32,7 +32,7 @@ describe('Edit process filters cloud', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/edit-task-filters-component.e2e.ts

@@ -20,7 +20,7 @@ import {
     AppListCloudPage,
     StringUtil,
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     TasksService,
     IdentityService,
     GroupIdentityService
@@ -32,7 +32,7 @@ describe('Edit task filters cloud', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts

@@ -17,7 +17,7 @@
 
 import {
     ApiService, AppListCloudPage, GroupIdentityService, IdentityService,
-    LoginSSOPage, NotificationHistoryPage, ProcessCloudWidgetPage, ProcessDefinitionsService,
+    LoginPage, NotificationHistoryPage, ProcessCloudWidgetPage, ProcessDefinitionsService,
     ProcessInstancesService, QueryService, TaskFormCloudComponent, TaskHeaderCloudPage,
     TasksService
 } from '@alfresco/adf-testing';
@@ -27,7 +27,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('Form Field Component - Dropdown Widget', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts

@@ -18,7 +18,7 @@
 import {
     FormCloudComponentPage,
     FormPage,
-    LoginSSOPage,
+    LoginPage,
     ProcessCloudWidgetPage
 } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
@@ -36,7 +36,7 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 
 describe('People and Group of people Widgets', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const formCloudComponentPage = new FormCloudComponentPage();
     const widget = new ProcessCloudWidgetPage();

e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import {
-    LoginSSOPage,
+    LoginPage,
     AppListCloudPage,
     IdentityService,
     GroupIdentityService,
@@ -43,7 +43,7 @@ describe('Task cloud visibility', async () => {
     const taskFormCloudComponent = new TaskFormCloudComponent();
     const startProcessPage = new StartProcessCloudPage();
     const processCloudDemoPage = new ProcessCloudDemoPage();
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const widget = new ProcessCloudWidgetPage();
 
     const apiService = new ApiService();

e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FormCloudComponentPage, LoginSSOPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing';
+import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ import { tabFieldValueVisibilityJson, tabVarValueVisibilityJson, tabVarFieldVisi
 
 describe('Visibility conditions on tabs - cloud', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const formCloudDemoPage = new FormCloudComponentPage();
     const widget = new ProcessCloudWidgetPage();

e2e/process-services-cloud/form-field/visibility-condition.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FormCloudComponentPage, LoginSSOPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing';
+import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -26,7 +26,7 @@ import { dropdownVisibilityFormFieldJson, dropdownVisibilityFormVariableJson } f
 
 describe('Visibility conditions - cloud', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const formCloudDemoPage = new FormCloudComponentPage();
     const widget = new ProcessCloudWidgetPage();

e2e/process-services-cloud/people-group-cloud-component.e2e.ts

@@ -20,7 +20,7 @@ import {
     GroupCloudComponentPage,
     GroupIdentityService,
     IdentityService,
-    LoginSSOPage,
+    LoginPage,
     PeopleCloudComponentPage,
     RolesService
 } from '@alfresco/adf-testing';
@@ -32,7 +32,7 @@ describe('People Groups Cloud Component', () => {
 
     describe('People Groups Cloud Component', () => {
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
         const peopleCloudComponent = new PeopleCloudComponentPage();

e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
+import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/people-group-cloud-component.page';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
@@ -24,7 +24,7 @@ describe('People Groups Cloud Component', () => {
 
     describe('People Groups Cloud Component', () => {
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
         const peopleCloudComponent = new PeopleCloudComponentPage();

e2e/process-services-cloud/process-custom-filters.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LocalStorageUtil, LoginPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
@@ -27,7 +27,7 @@ describe('Process list cloud', () => {
 
     describe('Process List', () => {
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-filter-results.e2e.ts

@@ -22,7 +22,7 @@ import {
     GroupIdentityService,
     IdentityService,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     ProcessDefinitionsService,
     ProcessInstancesService,
     QueryService,
@@ -40,7 +40,7 @@ import moment = require('moment');
 
 describe('Process filters cloud', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-filter-task.e2e.ts

@@ -19,7 +19,7 @@ import {
     ApiService,
     AppListCloudPage,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     ProcessDefinitionsService,
     ProcessInstancesService,
     QueryService,
@@ -41,7 +41,7 @@ import {
 
 describe('Process filters cloud', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-filters-cloud.e2e.ts

@@ -20,7 +20,7 @@ import {
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     ProcessDefinitionsService,
     ProcessInstancesService,
@@ -37,7 +37,7 @@ import CONSTANTS = require('../util/constants');
 describe('Process filters cloud', () => {
 
     describe('Process Filters', () => {
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-header-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
@@ -33,7 +33,7 @@ describe('Process Header cloud component', () => {
 
         const processHeaderCloudPage = new ProcessHeaderCloudPage();
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts

@@ -20,7 +20,7 @@ import {
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
-    LoginSSOPage,
+    LoginPage,
     ProcessDefinitionsService,
     ProcessInstancesService,
     StringUtil
@@ -37,7 +37,7 @@ describe('Process list cloud', () => {
 
         const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-list-selection-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
@@ -30,7 +30,7 @@ describe('Process list cloud', () => {
 
         const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts

@@ -20,7 +20,7 @@ import {
     ApiService,
     AppListCloudPage,
     ContentNodeSelectorDialogPage,
-    LoginSSOPage,
+    LoginPage,
     ProcessCloudWidgetPage,
     ProcessDefinitionsService,
     ProcessInstancesService,
@@ -36,7 +36,7 @@ import CONSTANTS = require('../util/constants');
 
 describe('Process Task - Attach content file', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/start-process-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginSSOPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
 import { browser, protractor } from 'protractor';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
@@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants');
 
 describe('Start Process', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const processCloudDemoPage = new ProcessCloudDemoPage();

e2e/process-services-cloud/start-task-form-cloud.e2e.ts

@@ -19,7 +19,7 @@ import { browser, protractor } from 'protractor';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
 import {
-    LoginSSOPage,
+    LoginPage,
     AppListCloudPage,
     StringUtil,
     StartTasksCloudPage,
@@ -47,7 +47,7 @@ import CONSTANTS = require('../util/constants');
 
 describe('Start Task Form', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const taskFormCloudComponent = new TaskFormCloudComponent();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();

e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts

@@ -19,7 +19,7 @@ import { browser } from 'protractor';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
 import {
-    LoginSSOPage,
+    LoginPage,
     AppListCloudPage,
     StringUtil,
     TaskHeaderCloudPage,
@@ -35,7 +35,7 @@ describe('Start Task', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();

e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts

@@ -19,7 +19,7 @@ import { browser } from 'protractor';
 import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
 import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
 import {
-    LoginSSOPage,
+    LoginPage,
     AppListCloudPage,
     StringUtil,
     GroupCloudComponentPage,
@@ -35,7 +35,7 @@ describe('Start Task - Group Cloud Component', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/task-filters-cloud.e2e.ts

@@ -17,7 +17,7 @@
 
 import { browser } from 'protractor';
 import {
-    LoginSSOPage,
+    LoginPage,
     TasksService,
     ApiService,
     AppListCloudPage,
@@ -35,7 +35,7 @@ describe('Task filters cloud', () => {
 
         const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts

@@ -20,7 +20,7 @@ import {
     AppListCloudPage,
     StringUtil,
     ApiService,
-    LoginSSOPage,
+    LoginPage,
     TasksService,
     ProcessDefinitionsService,
     ProcessInstancesService,
@@ -33,7 +33,7 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas
 
 describe('Task form cloud component', () => {
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/task-form-cloud-component.e2e.ts

@@ -19,7 +19,7 @@ import { browser, protractor } from 'protractor';
 import {
     ApiService,
     AppListCloudPage,
-    LoginSSOPage,
+    LoginPage,
     ProcessCloudWidgetPage,
     ProcessDefinitionsService,
     ProcessInstancesService,
@@ -38,7 +38,7 @@ describe('Task form cloud component', () => {
     const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name;
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/task-header-cloud.e2e.ts

@@ -22,7 +22,7 @@ import {
     GroupIdentityService,
     IdentityService,
     LocalStorageUtil,
-    LoginSSOPage,
+    LoginPage,
     StringUtil,
     TaskHeaderCloudPage,
     TasksService,
@@ -42,7 +42,7 @@ describe('Task Header cloud component', () => {
 
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-    const loginSSOPage = new LoginSSOPage();
+    const loginSSOPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();

e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page';
 import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
@@ -26,7 +26,7 @@ describe('Process list cloud', () => {
 
         const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
 
-        const loginSSOPage = new LoginSSOPage();
+        const loginSSOPage = new LoginPage();
         const navigationBarPage = new NavigationBarPage();
         const appListCloudComponent = new AppListCloudPage();
         const tasksCloudDemoPage = new TasksCloudDemoPage();