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();