diff --git a/e2e/content-services/about-content-services.component.e2e.ts b/e2e/content-services/about-content-services.component.e2e.ts index dcb6c8a0b9..cc953789b0 100644 --- a/e2e/content-services/about-content-services.component.e2e.ts +++ b/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; diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 7f78719a7b..a974331a3d 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 287392acea..5ec648cc09 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/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(); diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index 39ee03f063..aafda99270 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/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(); diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts index 41fc19e6f6..071882b765 100644 --- a/e2e/content-services/directives/delete-directive.e2e.ts +++ b/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(); diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index 1f2c27d1b1..0bd7185368 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/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(); diff --git a/e2e/content-services/directives/edit-folder-directive.e2e.ts b/e2e/content-services/directives/edit-folder-directive.e2e.ts index 60bdf41255..58339f54c7 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/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(); }); diff --git a/e2e/content-services/directives/favorite-directive.e2e.ts b/e2e/content-services/directives/favorite-directive.e2e.ts index afcd691817..442009f5fc 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/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; diff --git a/e2e/content-services/directives/restore-content-directive.e2e.ts b/e2e/content-services/directives/restore-content-directive.e2e.ts index 3f8f091104..18542a244d 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-actions.e2e.ts b/e2e/content-services/document-list/document-list-actions.e2e.ts index faf2872d80..eca8b46661 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index 5cc9db1a30..3fde884aed 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts b/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts index d9653b519c..f850c56afb 100644 --- a/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts +++ b/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); diff --git a/e2e/content-services/document-list/document-list-gallery.e2e.ts b/e2e/content-services/document-list/document-list-gallery.e2e.ts index 9fc526997a..6b518fdb93 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/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); diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts index d55b20783e..94af296e80 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-permissions.e2e.ts b/e2e/content-services/document-list/document-list-permissions.e2e.ts index 57bbff8d95..d331f4d86e 100644 --- a/e2e/content-services/document-list/document-list-permissions.e2e.ts +++ b/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'); }); }); diff --git a/e2e/content-services/document-list/document-list-properties.e2e.ts b/e2e/content-services/document-list/document-list-properties.e2e.ts index bc346b69e0..62bdebe432 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-selection.e2e.ts b/e2e/content-services/document-list/document-list-selection.e2e.ts index a4ea27c285..0595f3db8d 100644 --- a/e2e/content-services/document-list/document-list-selection.e2e.ts +++ b/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(); diff --git a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts b/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts index 7a20534757..a9042333a2 100644 --- a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts +++ b/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(); diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index 1797af30d3..d6e5316046 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/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(); diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 6a61e4d9c8..c8913169a4 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/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(); diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index 18a545b058..d9651b63b0 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/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(); diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index 7b41fc5995..f17364f7ab 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/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(); diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index daa9e0833d..407e9dc807 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/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(); diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 18b476f4d6..4bb74092fe 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index e8d08020c1..5b17b67028 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/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 () => { diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index 6b888fd6a1..db7ea72398 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/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(); diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 20517ef919..8574322469 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/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(); }); }); diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index c94d2d2af4..c03b7b1a17 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index 6891a4da74..aab267c466 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/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' }); diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index 6ff4ce27ba..e5e9330fb1 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index 3f7f6b95fb..2dff881fe1 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/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(); diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index 3753e9887d..e35ee984b7 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index 99b3c7c850..ac5ccb6f51 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/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); diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index 82adbf73be..cd50f3c332 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/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); diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index cda8f9b3a4..0fba08cbf9 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/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(); diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 60a7ce9b31..823d6a3e58 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/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(); diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index 1ff4ac664d..2e6117708f 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/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(); diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 0cc651cdf7..9b75ef4501 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/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(); diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 187e37dcb4..e642b548e9 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/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(); diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index 4813aca513..93a928c3a9 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/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(); diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index 6269b0e80a..c635cb043d 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/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(); diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 86b4a2aaac..e431e405c5 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/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(); diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index b5587ea1ce..01563a546c 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/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(); diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 0d0e2821e4..2a57850d8e 100644 --- a/e2e/core/error-component.e2e.ts +++ b/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.'); diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 92c01aa1e8..5a09586f8e 100644 --- a/e2e/core/header-component.e2e.ts +++ b/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(); diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 706fc2ee78..90125800de 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/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(); diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index c46847bbf4..2161c13497 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/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(); diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index a9f4cbd2a4..771721bf00 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/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(); }); diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts index 1cd5ee0dfc..d211745789 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/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 loginPage = new LoginPage(); + const loginSSOPage = new LoginPage(); + const loginPage = new LoginShellPage(); const navigationBarPage = new NavigationBarPage(); describe('Login component - SSO implicit Flow', () => { diff --git a/e2e/core/login/login-sso/logout-sso.e2e.ts b/e2e/core/login/login-sso/logout-sso.e2e.ts index d9d6abda80..1d326cee12 100644 --- a/e2e/core/login/login-sso/logout-sso.e2e.ts +++ b/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'); }); }); diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index f2e9b20582..1887c5f662 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/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); }); }); diff --git a/e2e/core/login/remember-me.e2e.ts b/e2e/core/login/remember-me.e2e.ts index ac9ab5ba21..6d7fe4590f 100644 --- a/e2e/core/login/remember-me.e2e.ts +++ b/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(); diff --git a/e2e/core/notifications-component.e2e.ts b/e2e/core/notifications-component.e2e.ts index cac6c31211..9e2062687e 100644 --- a/e2e/core/notifications-component.e2e.ts +++ b/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(); diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 5ebabba32b..0be61b335d 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/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(); diff --git a/e2e/core/settings-component.e2e.ts b/e2e/core/settings-component.e2e.ts index a9f84c367f..95f81d869f 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/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'); }); diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index 19f1ed9f26..3d043ea3ad 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/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); diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index dd2ec447df..4a7e1c2535 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts index 6f51b73585..0e450ac891 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index 9830badfdf..a61db672b4 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts index f1a7147074..7a3a5b4024 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts index 52ec887bf6..f0f8b83670 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts index 51a40c02a2..32af2fa8ce 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts index 0b7f2be0f3..a4b7efb6fa 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts index 6aad09c447..51a1cffc87 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index ccb88d0790..6907a38fd8 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 2ce8555e05..8900a93be8 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/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; diff --git a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts index bc20450f13..b75f16aa96 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index 318af046bb..72f6c32848 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/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(); diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index f3c9a75655..c8fafebab1 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/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(); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index 5564fdd0a7..de12257196 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/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(); diff --git a/e2e/pages/adf/demo-shell/login.page.ts b/e2e/pages/adf/demo-shell/login-shell.page.ts similarity index 97% rename from e2e/pages/adf/demo-shell/login.page.ts rename to e2e/pages/adf/demo-shell/login-shell.page.ts index 237708650c..d5ddc14a18 100644 --- a/e2e/pages/adf/demo-shell/login.page.ts +++ b/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"]')); diff --git a/e2e/pages/adf/navigation-bar.page.ts b/e2e/pages/adf/navigation-bar.page.ts index 7427198565..9cf172ed2e 100644 --- a/e2e/pages/adf/navigation-bar.page.ts +++ b/e2e/pages/adf/navigation-bar.page.ts @@ -191,7 +191,7 @@ export class NavigationBarPage { } async openContentServicesFolder(folderId): Promise { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/files/${folderId}`); + await BrowserActions.getUrl(`${browser.baseUrl}/files/${folderId}`); } async openLanguageMenu(): Promise { @@ -234,11 +234,11 @@ export class NavigationBarPage { } async openViewer(nodeId: string): Promise { - 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 { - 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 { diff --git a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts b/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts index c3e4aef39a..46527ec4e7 100644 --- a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index 9dfd43f654..daa9b2bb24 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts index ec3ebcb0f1..e0614758e5 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts index 9fab873e24..b90c5b9003 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts index 6b40856166..6da5afde64 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts b/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts index 4fc077060b..e39eaad685 100644 --- a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts index bce7aa000d..d05b7c581f 100644 --- a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts index a663bbd70f..0f9ac5042e 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts index 8445cb4380..4e840ecf13 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts index 2d9ee33a74..36dc3ebd5c 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts index b485fbbc9e..81afa05c93 100644 --- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index 0da499386d..a03afc42a4 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 84adaf6890..fad05c10d4 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-filter-task.e2e.ts b/e2e/process-services-cloud/process-filter-task.e2e.ts index ed95a2a279..ffecb43e29 100644 --- a/e2e/process-services-cloud/process-filter-task.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index 9c9c26d6d4..7013da50d2 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 63b86285ed..6c629d0f23 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts index 6d4b19d356..9bcfc76b97 100644 --- a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts index 5eb2eb2458..c9b198f734 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts index bc6c6603b8..d0e7f7469c 100644 --- a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index 80b03fb85d..ab683c6845 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index a04b2ac432..f37ee5ac6e 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts index 6ee21991fe..d66ac5201f 100644 --- a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts index 435578ace7..8c0e4d72a1 100644 --- a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 6e3b78f0fe..755ba85a82 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts index dabf2353a6..94dd26a390 100644 --- a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts index 033056a77e..cd3fe12a2f 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index bf9ed4301f..3f59ef4bbb 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts index 74ad3b1b18..fd1908a977 100644 --- a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts +++ b/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(); diff --git a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts index c149473b98..a9ae9a0025 100644 --- a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { StringUtil, TasksService, - LoginSSOPage, ApiService, + LoginPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; @@ -27,7 +27,7 @@ import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; describe('Edit task filters and task list properties', () => { - const loginSSOPage = new LoginSSOPage(); + const loginSSOPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 1a3522c34f..80adbc1d07 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -19,7 +19,7 @@ import { browser } from 'protractor'; import { StringUtil, TasksService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, + LoginPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; @@ -33,7 +33,7 @@ describe('Edit task filters and task list properties', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name; - const loginSSOPage = new LoginSSOPage(); + const loginSSOPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 9366d0d195..6f3eed0235 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -20,7 +20,7 @@ import { AppListCloudPage, GroupIdentityService, IdentityService, - LoginSSOPage, + LoginPage, StringUtil, TasksService } from '@alfresco/adf-testing'; @@ -34,7 +34,7 @@ describe('Task list cloud - selection', () => { 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(); diff --git a/e2e/process-services-cloud/tasks-claim-release.e2e.ts b/e2e/process-services-cloud/tasks-claim-release.e2e.ts index 5c47b0fe66..a154bcb725 100644 --- a/e2e/process-services-cloud/tasks-claim-release.e2e.ts +++ b/e2e/process-services-cloud/tasks-claim-release.e2e.ts @@ -22,7 +22,7 @@ import { GroupIdentityService, IdentityService, LocalStorageUtil, - LoginSSOPage, + LoginPage, ProcessDefinitionsService, ProcessInstancesService, TaskFormCloudComponent, @@ -37,7 +37,7 @@ describe('Task claim/release', () => { const candidateApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP; - const loginSSOPage = new LoginSSOPage(); + const loginSSOPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index 5a01612428..d7d554cf32 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -23,7 +23,7 @@ import { QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, + LoginPage, ApiService, IdentityService, GroupIdentityService, @@ -38,7 +38,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(); diff --git a/e2e/process-services/about-process-services.e2e.ts b/e2e/process-services/about-process-services.e2e.ts index 621debafae..ec6faa61b4 100644 --- a/e2e/process-services/about-process-services.e2e.ts +++ b/e2e/process-services/about-process-services.e2e.ts @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AboutPage, ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { AboutPage, ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('About Process Services', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const aboutPage = new AboutPage(); diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index 1c89ca36a6..c3033c6f5d 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ModelsActions } from '../actions/APS/models.actions'; @@ -28,7 +28,7 @@ describe('Modify applications', () => { const appToBeDeleted = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const replacingApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts index 7725b63afd..7b2909314b 100644 --- a/e2e/process-services/attach-file-content-service.e2e.ts +++ b/e2e/process-services/attach-file-content-service.e2e.ts @@ -22,7 +22,7 @@ import { ExternalNodeSelectorDialogPage, IntegrationService, LocalStorageUtil, - LoginSSOPage, + LoginPage, UploadActions, UserModel, UsersActions, @@ -37,7 +37,7 @@ describe('Attach File - Content service', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const widget = new Widget(); const taskPage = new TasksPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts index 093ea7e810..c60bc43e56 100644 --- a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts +++ b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, UserModel, UsersActions, ViewerPage, @@ -33,7 +33,7 @@ import CONSTANTS = require('../util/constants'); describe('Start Task - Task App', () => { const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const viewerPage = new ViewerPage(); const widget = new Widget(); const taskPage = new TasksPage(); diff --git a/e2e/process-services/attach-folder.e2e.ts b/e2e/process-services/attach-folder.e2e.ts index acd011f004..858ae5d6fc 100644 --- a/e2e/process-services/attach-folder.e2e.ts +++ b/e2e/process-services/attach-folder.e2e.ts @@ -21,7 +21,7 @@ import { ContentNodeSelectorDialogPage, IntegrationService, LocalStorageUtil, - LoginSSOPage, + LoginPage, UserModel, UsersActions, Widget @@ -39,7 +39,7 @@ describe('Attach Folder', () => { const applicationService = new ApplicationsUtil(apiService); const usersActions = new UsersActions(apiService); - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const widget = new Widget(); const taskPage = new TasksPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 5b7f62cfc6..dd3e4925b8 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, FormFields, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, FormFields, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AttachFormPage } from '../pages/adf/process-services/attach-form.page'; @@ -27,7 +27,7 @@ import CONSTANTS = require('../util/constants'); describe('Attach Form Component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const taskDetailsPage = new TaskDetailsPage(); const attachFormPage = new AttachFormPage(); diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index 319ef2f377..92fbb0843f 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-checklist-dialog.page'; @@ -30,7 +30,7 @@ describe('Checklist component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const processServices = new ProcessServicesPage(); const checklistDialog = new ChecklistDialog(); diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index a532ea339c..bf39322942 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { CommentsPage } from '../pages/adf/comments.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; @@ -25,7 +25,7 @@ describe('Comment component for Processes', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const commentsPage = new CommentsPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index 8bd656cbfc..f11cab87bc 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { CommentsPage } from '../pages/adf/comments.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; @@ -29,7 +29,7 @@ describe('Comment component for Processes', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); const commentsPage = new CommentsPage(); diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index 4e4cae6880..56ccd917e7 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { FiltersPage } from '../pages/adf/process-services/filters.page'; @@ -26,7 +26,7 @@ describe('Sorting for process filters', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processFiltersPage = new ProcessFiltersPage(); const filtersPage = new FiltersPage(); diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index 7c5d80fc39..98e3f65aff 100644 --- a/e2e/process-services/custom-process-filters.e2e.ts +++ b/e2e/process-services/custom-process-filters.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { AppSettingsTogglesPage } from '../pages/adf/process-services/dialog/app-settings-toggles.page'; @@ -25,7 +25,7 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('New Process Filters', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); const appSettingsToggles = new AppSettingsTogglesPage(); diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index b35688133d..9d681d1ca5 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -20,7 +20,7 @@ import { ApplicationsUtil, ArrayUtil, DateUtil, - LoginSSOPage, + LoginPage, PaginationPage, ProcessUtil, UsersActions @@ -37,7 +37,7 @@ describe('Start Task - Custom App', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const secondApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskListSinglePage = new TaskListDemoPage(); const paginationPage = new PaginationPage(); diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index d262afb357..23abaf8c99 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -20,7 +20,7 @@ import { ApplicationsUtil, DatePickerCalendarPage, DateUtil, - LoginSSOPage, + LoginPage, UsersActions, Widget } from '@alfresco/adf-testing'; @@ -31,7 +31,7 @@ import { browser } from 'protractor'; describe('Dynamic Table', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); const datePicker = new DatePickerCalendarPage(); diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 6dbf3951a4..1dcba93e51 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; @@ -28,7 +28,7 @@ describe('Empty Process List Test', () => { const appWithProcess = browser.params.resources.Files.APP_WITH_PROCESSES; const simpleAppWithUserForm = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const processFiltersPage = new ProcessFiltersPage(); diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index c6d561fb7e..1cd2d0dd23 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -15,13 +15,13 @@ * limitations under the License. */ -import { ApiService, FormPage, LoginSSOPage, UsersActions, Widget } from '@alfresco/adf-testing'; +import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; describe('Form Component', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const formPage = new FormPage(); const widget = new Widget(); diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index c249fa841d..ad511d0913 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, StartProcessPage, UsersActions, Widget @@ -34,7 +34,7 @@ describe('Form widgets - People ', () => { const app = browser.params.resources.Files.APP_WITH_USER_WIDGET; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const startProcess = new StartProcessPage(); const processDetailsPage = new ProcessDetailsPage(); diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index c71f714b3c..16cf17e393 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -35,7 +35,7 @@ const formInstance = new FormDefinitionModel(); describe('Form widgets', () => { const taskPage = new TasksPage(); - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const widget = new Widget(); const apiService = new ApiService(); @@ -214,7 +214,7 @@ describe('Form widgets', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/info-drawer.e2e.ts b/e2e/process-services/info-drawer.e2e.ts index ed08197c17..ebc3bbe275 100644 --- a/e2e/process-services/info-drawer.e2e.ts +++ b/e2e/process-services/info-drawer.e2e.ts @@ -21,7 +21,7 @@ import { BrowserActions, BrowserVisibility, LocalStorageUtil, - LoginSSOPage, + LoginPage, StringUtil, UserModel, UsersActions @@ -40,7 +40,7 @@ describe('Info Drawer', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); diff --git a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts index 9ae9638499..ba893b37cc 100644 --- a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts +++ b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, PaginationPage, ProcessUtil, UsersActions @@ -32,7 +32,7 @@ describe('Process List - Pagination when adding processes', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const paginationPage = new PaginationPage(); const processFiltersPage = new ProcessFiltersPage(); const processDetailsPage = new ProcessDetailsPage(); diff --git a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts index 74e970fe2d..01ab086378 100644 --- a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, PaginationPage, ProcessUtil, UsersActions @@ -32,7 +32,7 @@ describe('Items per page set to 15 and adding of tasks', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const paginationPage = new PaginationPage(); diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 5d609c6c89..29b87ddc69 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-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 { TasksPage } from '../pages/adf/process-services/tasks.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; @@ -29,7 +29,7 @@ describe('People component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); const processServices = new ProcessServicesPage(); diff --git a/e2e/process-services/process-attachment-list-action-menu.e2e.ts b/e2e/process-services/process-attachment-list-action-menu.e2e.ts index 3663f7455f..34111e8b1e 100644 --- a/e2e/process-services/process-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/process-attachment-list-action-menu.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, FileBrowserUtil, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, ViewerPage @@ -35,7 +35,7 @@ describe('Attachment list action menu for processes', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const processDetailsPage = new ProcessDetailsPage(); const attachmentListPage = new AttachmentListPage(); diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index 5027e4e06a..236684d3d6 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; @@ -38,7 +38,7 @@ describe('Process Filters Test', () => { const app = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processListPage = new ProcessListPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); @@ -144,7 +144,7 @@ describe('Process Filters Test', () => { return currentApp.modelId === appModel.id; }); - processFilterUrl = browser.params.testConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/'; + processFilterUrl = browser.baseUrl + '/activiti/apps/' + deployedApp.id + '/processes/'; const taskAppFilters = await apiService.getInstance().activiti.userFiltersApi.getUserProcessInstanceFilters({ appId: deployedApp.id }); await processServicesPage.goToApp(app.title); diff --git a/e2e/process-services/process-instance-details.e2e.ts b/e2e/process-services/process-instance-details.e2e.ts index 192509a1b2..0f239ffcad 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; @@ -28,7 +28,7 @@ describe('Process Instance Details', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); diff --git a/e2e/process-services/process-list-component.e2e.ts b/e2e/process-services/process-list-component.e2e.ts index 80169428e3..98d9af04fc 100644 --- a/e2e/process-services/process-list-component.e2e.ts +++ b/e2e/process-services/process-list-component.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; @@ -31,7 +31,7 @@ describe('Process List Test', () => { const appWithDateField = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; const appWithUserWidget = browser.params.resources.Files.APP_WITH_USER_WIDGET; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const processListDemoPage = new ProcessListDemoPage(); const apiService = new ApiService(); @@ -97,7 +97,7 @@ describe('Process List Test', () => { }); beforeEach(async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/process-list'); + await BrowserActions.getUrl(browser.baseUrl + '/process-list'); }); it('[C286638] Should display all process by default', async () => { diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 803992afbc..4ca5c2eb42 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, PaginationPage, ProcessUtil, UsersActions @@ -32,7 +32,7 @@ describe('Process List - Pagination', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const paginationPage = new PaginationPage(); const processFiltersPage = new ProcessFiltersPage(); diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 12ddd05c24..4e53d0d5e2 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, PaginationPage, StringUtil, UsersActions @@ -33,7 +33,7 @@ describe('Task List Pagination - Sorting', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const paginationPage = new PaginationPage(); diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index ee024c49a7..f699e16b99 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import * as fs from 'fs'; @@ -29,7 +29,7 @@ describe('Start Task - Task App', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index a5985012a3..8c40e95c43 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -21,7 +21,7 @@ import { ApplicationsUtil, FileBrowserUtil, LocalStorageUtil, - LoginSSOPage, + LoginPage, ProcessInstanceTasksPage, SelectAppsDialog, StartProcessPage, @@ -48,7 +48,7 @@ describe('Start Process Component', () => { const dateFormApp = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; const startProcessAttachFileApp = browser.params.resources.Files.START_PROCESS_ATTACH_FILE; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const startProcessPage = new StartProcessPage(); diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index 7ea551021b..af37b71e05 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; @@ -29,7 +29,7 @@ describe('Start Task - Custom App', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const attachmentListPage = new AttachmentListPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index bf519f0aa2..23e6ed647c 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; @@ -32,7 +32,7 @@ describe('Start Task - Task App', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const attachmentListPage = new AttachmentListPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/process-services/stencil.e2e.ts b/e2e/process-services/stencil.e2e.ts index 7a39f5f8ab..2a5989be9f 100644 --- a/e2e/process-services/stencil.e2e.ts +++ b/e2e/process-services/stencil.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, StartProcessPage, UserModel, UsersActions @@ -37,7 +37,7 @@ describe('Stencil', () => { const app = browser.params.resources.Files.STENCIL_PROCESS; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const navigationBarPage = new NavigationBarPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); diff --git a/e2e/process-services/task-assignee.e2e.ts b/e2e/process-services/task-assignee.e2e.ts index b088f450eb..cd419c6fd1 100644 --- a/e2e/process-services/task-assignee.e2e.ts +++ b/e2e/process-services/task-assignee.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, ProcessUtil, StartProcessPage, UserModel, @@ -38,7 +38,7 @@ describe('Task Assignee', () => { const app = browser.params.resources.Files.TEST_ASSIGNEE; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const processListPage = new ProcessListPage(); diff --git a/e2e/process-services/task-attachment-list-action-menu.e2e.ts b/e2e/process-services/task-attachment-list-action-menu.e2e.ts index 9196d4c8b3..2358f821d7 100644 --- a/e2e/process-services/task-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/task-attachment-list-action-menu.e2e.ts @@ -20,7 +20,7 @@ import { ApiService, ApplicationsUtil, FileBrowserUtil, - LoginSSOPage, + LoginPage, UsersActions, ViewerPage } from '@alfresco/adf-testing'; @@ -37,7 +37,7 @@ describe('Attachment list action menu for tasks', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); const attachmentListPage = new AttachmentListPage(); diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 5667b1f9f0..ad4bb8b973 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import CONSTANTS = require('../util/constants'); @@ -26,7 +26,7 @@ describe('Task Audit', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const processServices = new ProcessServicesPage(); @@ -58,7 +58,7 @@ describe('Task Audit', () => { }); beforeEach(async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); + await BrowserActions.getUrl(browser.baseUrl + '/activiti'); }); it('[C260386] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone running task', async () => { diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index f543000e85..28aeed265e 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, ProcessUtil, StringUtil, UsersActions, @@ -36,7 +36,7 @@ import { TaskRepresentation } from '@alfresco/js-api'; import CONSTANTS = require('../util/constants'); describe('Task Details - Form', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const tasksListPage = new TasksListPage(); const taskDetailsPage = new TaskDetailsPage(); const attachFormPage = new AttachFormPage(); diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index 87b6172ddc..eb2d993ce3 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; @@ -25,7 +25,7 @@ describe('Task Details - No form', () => { const app = browser.params.resources.Files.NO_FORM_APP; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const apiService = new ApiService(); diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 4091169bf6..08f1bbf690 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, StringUtil, UsersActions @@ -39,7 +39,7 @@ describe('Task Details component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const processServices = new ProcessServicesPage(); - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const apiService = new ApiService(); @@ -74,7 +74,7 @@ describe('Task Details component', () => { }); beforeEach(async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); + await BrowserActions.getUrl(browser.baseUrl + '/activiti'); }); it('[C260506] Should display task details for standalone task - Task App', async () => { diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index c399be3ef0..6f1a5b9cfe 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; @@ -33,7 +33,7 @@ describe('Task', () => { const app = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const tasksPage = new TasksPage(); @@ -170,7 +170,7 @@ describe('Task', () => { }); describe('Custom Filters', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index 75e0dd3bb8..e4c50c802b 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; @@ -29,7 +29,7 @@ describe('Task Filters Sorting', () => { const app = browser.params.resources.Files.APP_WITH_PROCESSES; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const tasksPage = new TasksPage(); diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 0bfb1d80ad..33d316189b 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, ApplicationsUtil, - LoginSSOPage, + LoginPage, PaginationPage, ProcessUtil, UserModel, @@ -31,7 +31,7 @@ import CONSTANTS = require('../util/constants'); describe('Task List Pagination', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const taskPage = new TasksPage(); const paginationPage = new PaginationPage(); diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index e85484ef81..65ffae8d89 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; @@ -24,7 +24,7 @@ describe('Amount Widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.AMOUNT; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -54,7 +54,7 @@ describe('Amount Widget', () => { }); beforeEach(async() => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/attach-file-widget.e2e.ts b/e2e/process-services/widgets/attach-file-widget.e2e.ts index 81eef68450..58732be4b2 100644 --- a/e2e/process-services/widgets/attach-file-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-file-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, FileBrowserUtil, - LoginSSOPage, + LoginPage, UsersActions, ViewerPage, Widget @@ -37,7 +37,7 @@ describe('Attach widget - File', () => { const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const viewerPage = new ViewerPage(); const widget = new Widget(); const taskPage = new TasksPage(); diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index 1d93892ab9..e0772f215a 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Attach Folder widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.ATTACH_FOLDER; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -62,7 +62,7 @@ describe('Attach Folder widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index f3af428c46..91093ad944 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Checkbox Widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.CHECKBOX; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Checkbox Widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 9356837ece..cf9dbb65ab 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Date and time widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.DATETIME; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Date and time widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 3b83e2c43d..581389b3df 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -20,7 +20,7 @@ import { ApplicationsUtil, BrowserActions, FormPage, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -35,7 +35,7 @@ describe('Date widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.DATE; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -72,7 +72,7 @@ describe('Date widget', () => { describe('Simple App', () => { beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); @@ -103,7 +103,7 @@ describe('Date widget', () => { const formPage = new FormPage(); beforeAll(async () => { - const urlFormDemoPage = `${browser.params.testConfig.adf.url}/form`; + const urlFormDemoPage = `${browser.baseUrl}/form`; await BrowserActions.getUrl(urlFormDemoPage); }); diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index 6f54e61c0c..f0e7ee1988 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Document Template widget', () => { const app = browser.params.resources.Files.FILE_FORM_ADF; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Document Template widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index 074dae2a70..8c23a085b0 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -31,7 +31,7 @@ import CONSTANTS = require('../../util/constants'); describe('Dropdown widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.DROPDOWN; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -60,7 +60,7 @@ describe('Dropdown widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index 9a23cb1eda..4ebaae2d7a 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -31,7 +31,7 @@ import CONSTANTS = require('../../util/constants'); describe('Dynamic Table widget ', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); const navigationBarPage = new NavigationBarPage(); @@ -62,7 +62,7 @@ describe('Dynamic Table widget ', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); @@ -118,7 +118,7 @@ describe('Dynamic Table widget ', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.tasksListPage().checkTaskListIsLoaded(); @@ -172,7 +172,7 @@ describe('Dynamic Table widget ', () => { beforeEach(async () => { await loginPage.login(processUserModel.email, processUserModel.password); - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.tasksListPage().checkTaskListIsLoaded(); diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index be4a659b59..4cb696ddb8 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Header widget', async () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.HEADER; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Header widget', async () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index f42d961f6a..d9047e077b 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Hyperlink widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.HYPERLINK; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Hyperlink widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 4035485876..2dafee8681 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -31,7 +31,7 @@ import CONSTANTS = require('../../util/constants'); describe('Multi-line Widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.MULTILINE_TEXT; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -60,7 +60,7 @@ describe('Multi-line Widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index d2eb8eb04b..5eeefeb232 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Number widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.NUMBER; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Number widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/people-group-widget.e2e.ts b/e2e/process-services/widgets/people-group-widget.e2e.ts index 847159c5b8..3d2ca5ce58 100644 --- a/e2e/process-services/widgets/people-group-widget.e2e.ts +++ b/e2e/process-services/widgets/people-group-widget.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -25,7 +25,7 @@ describe('People and Group widget', () => { const app = browser.params.resources.Files.MORE_WIDGETS; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const navigationBarPage = new NavigationBarPage(); const widget = new Widget(); diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 6ec49e9ad5..17a2d8e058 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('People widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.ADD_PEOPLE; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('People widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index ff6cfcbb91..f6d114f2c0 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Radio Buttons Widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.RADIO_BUTTONS; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -62,7 +62,7 @@ describe('Radio Buttons Widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index cc5dabbda5..a0d1fb5800 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -32,7 +32,7 @@ describe('Text widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.TEXT; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -61,7 +61,7 @@ describe('Text widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/process-services/widgets/typeahead-widget.e2e.ts b/e2e/process-services/widgets/typeahead-widget.e2e.ts index 64cc06267d..6ff56fedd0 100644 --- a/e2e/process-services/widgets/typeahead-widget.e2e.ts +++ b/e2e/process-services/widgets/typeahead-widget.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -25,7 +25,7 @@ describe('Typeahead widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const navigationBarPage = new NavigationBarPage(); const widget = new Widget(); diff --git a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts index bd76c525c0..76578a4f4b 100644 --- a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts +++ b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, ApplicationsUtil, BrowserActions, - LoginSSOPage, + LoginPage, ProcessUtil, UsersActions, Widget @@ -54,7 +54,7 @@ describe('Process-Services - Visibility conditions', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.VISIBILITY; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const taskPage = new TasksPage(); const widget = new Widget(); @@ -83,7 +83,7 @@ describe('Process-Services - Visibility conditions', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.baseUrl}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); await taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); await taskPage.formFields().checkFormIsDisplayed(); diff --git a/e2e/resources/adf/BigFile.zip b/e2e/resources/adf/BigFile.zip index 7f02134a82..e69de29bb2 100644 Binary files a/e2e/resources/adf/BigFile.zip and b/e2e/resources/adf/BigFile.zip differ diff --git a/e2e/search/components/search-check-list.e2e.ts b/e2e/search/components/search-check-list.e2e.ts index 4a1bc61cb6..fb17eeb529 100644 --- a/e2e/search/components/search-check-list.e2e.ts +++ b/e2e/search/components/search-check-list.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, BrowserActions, LocalStorageUtil, - LoginSSOPage, + LoginPage, StringUtil, UploadActions, UserModel, @@ -34,7 +34,7 @@ import { browser } from 'protractor'; describe('Search Checklist Component', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchFiltersPage = new SearchFiltersPage(); const searchDialog = new SearchDialogPage(); const searchResults = new SearchResultsPage(); @@ -83,7 +83,7 @@ describe('Search Checklist Component', () => { beforeEach(async () => { await navigationBarPage.clickContentServicesButton(); - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=${randomName}`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=${randomName}`); }); afterAll(async () => { diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 857fa8596c..6ddf238079 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing'; +import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; import { browser, ElementFinder } from 'protractor'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -25,7 +25,7 @@ import { SearchConfiguration } from '../search.config'; describe('Search Date Range Filter', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const dateRangeFilter = searchFilters.createdDateRangeFilterPage(); diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index 3b4246ed5c..57d8c7bd72 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -20,7 +20,7 @@ import { DataTableComponentPage, DateUtil, LocalStorageUtil, - LoginSSOPage, + LoginPage, UploadActions, UserModel, UsersActions @@ -35,7 +35,7 @@ import { SearchConfiguration } from '../search.config'; describe('Search Number Range Filter', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const sizeRangeFilter = searchFilters.sizeRangeFilterPage(); diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index af321b7749..5a61396cf9 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, BrowserActions, LocalStorageUtil, - LoginSSOPage, + LoginPage, StringUtil, UploadActions, UserModel, @@ -34,7 +34,7 @@ import { browser } from 'protractor'; describe('Search Radio Component', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchFiltersPage = new SearchFiltersPage(); const navigationBarPage = new NavigationBarPage(); const searchDialog = new SearchDialogPage(); @@ -81,7 +81,7 @@ describe('Search Radio Component', () => { await loginPage.login(acsUser.email, acsUser.password); - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName); + await BrowserActions.getUrl(browser.baseUrl + '/search;q=' + randomName); }); afterAll(async () => { diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 1b09b2307f..8c5364f690 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -19,7 +19,7 @@ import { ApiService, DataTableComponentPage, LocalStorageUtil, - LoginSSOPage, + LoginPage, UploadActions, UserModel, UsersActions @@ -34,7 +34,7 @@ import { SearchConfiguration } from '../search.config'; describe('Search Slider Filter', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const sizeSliderFilter = searchFilters.sizeSliderFilterPage(); diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index f915d2c391..d4a21d29b5 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -18,7 +18,7 @@ import { ApiService, LocalStorageUtil, - LoginSSOPage, + LoginPage, SearchSortingPickerPage, UploadActions, UserModel, @@ -34,7 +34,7 @@ import { SearchConfiguration } from '../search.config'; describe('Search Sorting Picker', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const searchResults = new SearchResultsPage(); diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index afe77e5a3b..6054bcdbb4 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -23,7 +23,7 @@ import { ApiService, BrowserActions, LocalStorageUtil, - LoginSSOPage, + LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; @@ -39,7 +39,7 @@ describe('Search component - Text widget', () => { const navigationBarPage = new NavigationBarPage(); const searchFiltersPage = new SearchFiltersPage(); - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchResultPage = new SearchResultsPage(); @@ -75,7 +75,7 @@ describe('Search component - Text widget', () => { }); it('[C289329] Placeholder should be displayed in the widget when the input string is empty', async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); + await BrowserActions.getUrl(browser.baseUrl + '/search;q=*'); await searchResultPage.tableIsLoaded(); await searchFiltersPage.checkNameFilterIsDisplayed(); @@ -90,7 +90,7 @@ describe('Search component - Text widget', () => { }); it('[C289330] Should be able to change the Field setting', async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); + await BrowserActions.getUrl(browser.baseUrl + '/search;q=*'); await searchResultPage.tableIsLoaded(); await searchFiltersPage.checkCheckListFilterIsDisplayed(); diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index e4b1c3bf5d..1b9a940d35 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -21,7 +21,7 @@ import { ApiService, BrowserActions, LocalStorageUtil, - LoginSSOPage, + LoginPage, StringUtil, UploadActions, UserModel, @@ -47,7 +47,7 @@ describe('Search component - Search Bar', () => { } }; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); const navigationBarPage = new NavigationBarPage(); @@ -122,7 +122,7 @@ describe('Search component - Search Bar', () => { }); afterEach(async () => { - await BrowserActions.getUrl(browser.params.testConfig.adf.url); + await BrowserActions.getUrl(browser.baseUrl); }); it('[C272798] Search bar should be visible', async () => { diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index c362458699..6dd1c8b6d3 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -25,7 +25,7 @@ import { BrowserActions, DocumentListPage, LocalStorageUtil, - LoginSSOPage, + LoginPage, PaginationPage, StringUtil, UploadActions, @@ -37,7 +37,7 @@ import { SearchConfiguration } from './search.config'; describe('Search Filters', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchFiltersPage = new SearchFiltersPage(); const paginationPage = new PaginationPage(); @@ -134,7 +134,7 @@ describe('Search Filters', () => { }); it('[C277146] Should Show more/less buttons be hidden when inactive', async () => { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`); const searchCheckListPage = searchFiltersPage.creatorCheckListFiltersPage(); @@ -146,7 +146,7 @@ describe('Search Filters', () => { }); it('[C286556] Search categories should preserve their collapsed/expanded state after the search', async () => { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`); await searchFiltersPage.clickFileTypeListFilter(); await searchFiltersPage.checkFileTypeFilterIsCollapsed(); @@ -160,7 +160,7 @@ describe('Search Filters', () => { }); it('[C287796] Should be able to display the correct bucket number after selecting a filter', async () => { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`); await searchFiltersPage.fileTypeCheckListFiltersPage().clickCheckListOption('PNG Image'); @@ -191,7 +191,7 @@ describe('Search Filters', () => { }); it('[C291980] Should group search facets under specified labels', async () => { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`); await searchFiltersPage.checkDefaultFacetQueryGroupIsDisplayed(); await searchFiltersPage.checkTypeFacetQueryGroupIsDisplayed(); @@ -214,7 +214,7 @@ describe('Search Filters', () => { }); it('[C297509] Should display search intervals under specified labels from config', async () => { - await BrowserActions.getUrl(`${browser.params.testConfig.adf.url}/search;q=*`); + await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`); await searchFiltersPage.checkFacetIntervalsByCreatedIsDisplayed(); await searchFiltersPage.checkFacetIntervalsByCreatedIsExpanded(); diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index eb9fb3d884..16f5882766 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.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 { browser } from 'protractor'; import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../pages/adf/search-results.page'; @@ -25,7 +25,7 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Search Component - Multi-Select Facet', () => { - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const searchDialog = new SearchDialogPage(); const searchResultsPage = new SearchResultsPage(); const searchFiltersPage = new SearchFiltersPage(); diff --git a/e2e/search/search-page.e2e.ts b/e2e/search/search-page.e2e.ts index 15034913bf..a2d40f0424 100644 --- a/e2e/search/search-page.e2e.ts +++ b/e2e/search/search-page.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; +import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; import { ContentServicesPage } from '../pages/adf/content-services.page'; @@ -40,7 +40,7 @@ describe('Search component - Search Page', () => { } }; - const loginPage = new LoginSSOPage(); + const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); const searchDialog = new SearchDialogPage(); const searchResultPage = new SearchResultsPage(); diff --git a/e2e/test.config.js b/e2e/test.config.js index 93fc57286b..f378eae227 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -103,13 +103,6 @@ module.exports = { username: SCREENSHOT_USERNAME }, - adf: { - /** - * base - */ - url: HOST - }, - adf_external_acs: { /** * @config main.protocol {String} diff --git a/lib/testing/src/lib/core/pages/login-sso.page.ts b/lib/testing/src/lib/core/pages/login.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/login-sso.page.ts rename to lib/testing/src/lib/core/pages/login.page.ts index 574962ed4c..5a499bc3a4 100644 --- a/lib/testing/src/lib/core/pages/login-sso.page.ts +++ b/lib/testing/src/lib/core/pages/login.page.ts @@ -21,7 +21,9 @@ import { BrowserActions } from '../utils/browser-actions'; import { LocalStorageUtil } from '../utils/local-storage.util'; import { Logger } from '../utils/logger'; -export class LoginSSOPage { +export class LoginPage { + + loginUrl = `${browser.baseUrl}/login`; ssoButton = element(by.css(`[data-automation-id="login-button-sso"]`)); usernameField = element(by.id('username')); @@ -43,8 +45,8 @@ export class LoginSSOPage { } catch (e) { } - if (!currentUrl || currentUrl.indexOf(`${browser.baseUrl}/login`) === -1) { - await BrowserActions.getUrl(browser.baseUrl + '/login'); + if (!currentUrl || currentUrl.indexOf(this.loginUrl) === -1) { + await BrowserActions.getUrl(this.loginUrl); } await BrowserVisibility.waitUntilElementIsVisible(this.txtUsernameBasicAuth); diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index 43c63f9c48..dd4ee284e4 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -19,7 +19,10 @@ export * from './bread-crumb.page'; export * from './header.page'; export * from './user-info.page'; export * from './settings.page'; -export * from './login-sso.page'; +export * from './login.page'; + +export { LoginPage as LoginSSOPage } from './login.page'; + export * from './data-table-component.page'; export * from './pagination.page'; export * from './error.page'; diff --git a/lib/testing/src/lib/test.configuration.ts b/lib/testing/src/lib/test.configuration.ts index 63eac82f76..cae8c27d33 100644 --- a/lib/testing/src/lib/test.configuration.ts +++ b/lib/testing/src/lib/test.configuration.ts @@ -40,10 +40,6 @@ export interface TestConfiguration { rootPath: string; }; - adf: { - url: string; - }; - adf_external_acs: { host: string; }; diff --git a/package-lock.json b/package-lock.json index 6bf84ec892..8997f31a2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13397,9 +13397,9 @@ "dev": true }, "js-base64": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz", - "integrity": "sha512-1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz", + "integrity": "sha512-fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg==", "dev": true }, "js-beautify": { @@ -14563,9 +14563,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, "lodash-es": { @@ -16171,9 +16171,9 @@ "dev": true }, "node-sass": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz", - "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -16190,7 +16190,7 @@ "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", - "sass-graph": "^2.2.4", + "sass-graph": "2.2.5", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" }, @@ -20310,105 +20310,67 @@ } }, "sass-graph": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.6.tgz", - "integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "yargs": "^13.3.2" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" } }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, "yargs": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz", - "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "5.0.0-security.0" - } - }, - "yargs-parser": { - "version": "5.0.0-security.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz", - "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==", - "dev": true, - "requires": { - "camelcase": "^3.0.0", - "object.assign": "^4.1.0" + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } } }