ix build

.travis.yml

@@ -88,37 +88,35 @@ jobs:
         - stage: Release tag
           script: ./scripts/travis/release/git-tag.sh
 
-
         - stage: e2e Test
           name: core
-          before_script:
-            - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
-            - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
+          before_script: ./scripts/ci/job_hooks/before_e2e.sh
           script: ./scripts/travis/e2e/core-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
         - stage: e2e Test
           name:  content
-          before_script:
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
+          before_script: ./scripts/ci/job_hooks/before_e2e.sh
           script: ./scripts/travis/e2e/content-services-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
         - stage: e2e Test
           name:  search
-          before_script:
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
+          before_script: ./scripts/ci/job_hooks/before_e2e.sh
           script: ./scripts/travis/e2e/search-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
         - stage: e2e Test
           name: process
-          before_script:
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
+          before_script: ./scripts/ci/job_hooks/before_e2e.sh
           script: ./scripts/travis/e2e/process-services-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
         - stage: e2e Test
           name: process Cloud
-          before_script:
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
-              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
+          before_script: ./scripts/ci/job_hooks/before_e2e.sh
           script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
 
         - stage: Check bundle
           script:

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

@@ -83,7 +83,7 @@ describe('Comment Component', () => {
 
         await loginPage.login(acsUser.email, acsUser.password);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
     });
 
@@ -184,7 +184,7 @@ describe('Comment Component', () => {
 
             await loginPage.login(acsUser.email, acsUser.password);
 
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
         });
 
         afterAll(async () => {

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

@@ -84,7 +84,7 @@ describe('Version component actions', () => {
 
         await loginPage.login(acsUser.email, acsUser.password);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
    });
 

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

@@ -88,7 +88,7 @@ describe('Edit folder directive', () => {
 
     beforeEach(async () => {
         await navigationBarPage.clickHomeButton();
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
     });
 

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

@@ -80,7 +80,7 @@ describe('Favorite directive', () => {
     });
 
     beforeEach(async () => {
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
     });
 
@@ -95,7 +95,7 @@ describe('Favorite directive', () => {
         await customSourcesPage.selectFavoritesSourceType();
         await customSourcesPage.checkRowIsDisplayed(testFile.entry.name);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
         await contentServicesPage.getDocumentList().dataTablePage().checkContentIsDisplayed('Display name', testFile.entry.name);
         await contentServicesPage.getDocumentList().dataTablePage().selectRow('Display name', testFile.entry.name);
@@ -117,7 +117,7 @@ describe('Favorite directive', () => {
         await customSourcesPage.selectFavoritesSourceType();
         await customSourcesPage.checkRowIsDisplayed(testFolder1.entry.name);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
         await contentServicesPage.getDocumentList().dataTablePage().checkContentIsDisplayed('Display name', testFolder1.entry.name);
         await contentServicesPage.getDocumentList().dataTablePage().selectRow('Display name', testFolder1.entry.name);
@@ -153,7 +153,7 @@ describe('Favorite directive', () => {
         await trashcanPage.contentList.dataTablePage().waitTillContentLoaded();
         await trashcanPage.checkTrashcanIsEmpty();
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
         await contentServicesPage.getDocumentList().dataTablePage().checkContentIsDisplayed('Display name', testFile.entry.name);
         await contentServicesPage.getDocumentList().dataTablePage().selectRow('Display name', testFile.entry.name);

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

@@ -92,13 +92,13 @@ describe('Restore content directive', () => {
 
     beforeEach(async () => {
         await BrowserActions.closeMenuAndDialogs();
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
     });
 
     describe('Restore same name folders', () => {
         beforeAll(async () => {
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.waitForTableBody();
             await contentServicesPage.checkContentIsDisplayed(folderName);
             await contentServicesPage.deleteContent(folderName);
@@ -110,7 +110,7 @@ describe('Restore content directive', () => {
 
         it('[C260227] Should validate when restoring Folders with same name', async () => {
             await uploadActions.createFolder(folderName, '-my-');
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await browser.refresh();
             await contentServicesPage.waitForTableBody();
             await contentServicesPage.checkContentIsDisplayed(folderName);
@@ -123,7 +123,7 @@ describe('Restore content directive', () => {
             await trashcanPage.getDocumentList().dataTablePage().checkAllRows();
             await trashcanPage.clickRestore();
             await trashcanPage.getDocumentList().dataTablePage().checkRowContentIsDisplayed(folderName);
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
             await contentServicesPage.checkContentIsDisplayed(folderName);
 
@@ -144,7 +144,7 @@ describe('Restore content directive', () => {
 
         await notificationHistoryPage.checkNotifyContains(testFile.entry.name + ' item restored');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
         await contentServicesPage.checkContentIsDisplayed(testFile.entry.name);
         await contentServicesPage.deleteContent(testFile.entry.name);
@@ -165,7 +165,7 @@ describe('Restore content directive', () => {
         await trashcanPage.clickRestore();
         await trashcanPage.getDocumentList().dataTablePage().checkRowContentIsNotDisplayed(folderWithContent.entry.name);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
         await contentServicesPage.checkContentIsDisplayed(folderWithContent.entry.name);
         await contentServicesPage.getDocumentList().dataTablePage().doubleClickRow('Display name', folderWithContent.entry.name);
@@ -201,7 +201,7 @@ describe('Restore content directive', () => {
         await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(folderWithFolder.entry.name);
         await trashcanPage.clickRestore();
         await notificationHistoryPage.checkNotifyContains('Restore successful');
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
         await contentServicesPage.checkContentIsDisplayed(folderWithFolder.entry.name);
         await contentServicesPage.openFolder(folderWithFolder.entry.name);
@@ -261,7 +261,7 @@ describe('Restore content directive', () => {
             await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(publicSite.entry.id);
             await trashcanPage.clickRestore();
 
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.waitForTableBody();
             await contentServicesPage.selectSite(publicSite.entry.title);
             await contentServicesPage.waitForTableBody();
@@ -312,7 +312,7 @@ describe('Restore content directive', () => {
             await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(mainFile.entry.name);
             await trashcanPage.clickRestore();
 
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.waitForTableBody();
             await contentServicesPage.checkContentIsDisplayed(parentFolder.entry.name);
             await contentServicesPage.checkContentIsDisplayed(mainFolder.entry.name);

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

@@ -87,7 +87,7 @@ describe('Document List Component - Actions', () => {
         });
 
         beforeEach(async () => {
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
         });
 

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

@@ -118,7 +118,7 @@ describe('Document List Component', () => {
 
         beforeEach(async () => {
             await BrowserActions.closeMenuAndDialogs();
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
         });
 

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

@@ -59,7 +59,7 @@ describe('Document List Component - Properties', () => {
         });
 
         it('[C299154] Should disallow upload content on a folder row if allowDropFiles is false', async () => {
-            await navigationBar.clickContentServicesButton();
+            await navigationBar.navigateToContentServices();
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
 
             await contentServicesPage.openFolder(parentFolder.entry.name);
@@ -75,7 +75,7 @@ describe('Document List Component - Properties', () => {
         });
 
         it('[C91319] Should allow upload content on a folder row if allowDropFiles is true', async () => {
-            await navigationBar.clickContentServicesButton();
+            await navigationBar.navigateToContentServices();
             await contentServicesPage.getDocumentList().dataTablePage().waitTillContentLoaded();
 
             await contentServicesPage.openFolder(parentFolder.entry.name);

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

@@ -113,7 +113,7 @@ describe('Aspect oriented config', () => {
             }
         }));
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -143,7 +143,7 @@ describe('Aspect oriented config', () => {
             }
         }));
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -161,7 +161,7 @@ describe('Aspect oriented config', () => {
     it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided', async () => {
         await LocalStorageUtil.setConfigField('content-metadata', '{}');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -182,7 +182,7 @@ describe('Aspect oriented config', () => {
             }
         }));
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -222,7 +222,7 @@ describe('Aspect oriented config', () => {
             '  }' +
             '}');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -249,7 +249,7 @@ describe('Aspect oriented config', () => {
             '    }' +
             '}');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -276,7 +276,7 @@ describe('Aspect oriented config', () => {
             '    }' +
             '}');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();
@@ -298,7 +298,7 @@ describe('Aspect oriented config', () => {
             '    }' +
             '}');
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.clickInfoButton();

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

@@ -74,7 +74,7 @@ describe('CardView Component - properties', () => {
 
         await loginPage.login(acsUser.email, acsUser.password);
 
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
         await contentServicesPage.waitForTableBody();
    });
 

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

@@ -83,7 +83,7 @@ describe('Metadata component', () => {
     describe('Viewer Metadata', () => {
         beforeAll(async () => {
             await loginPage.login(acsUser.email, acsUser.password);
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.waitForTableBody();
             await LocalStorageUtil.setConfigField('content-metadata', JSON.stringify({
                 presets: {
@@ -230,7 +230,7 @@ describe('Metadata component', () => {
             await uploadActions.createFolder(folderName, '-my-');
 
             await loginPage.login(acsUser.email, acsUser.password);
-            await navigationBarPage.clickContentServicesButton();
+            await navigationBarPage.navigateToContentServices();
             await contentServicesPage.waitForTableBody();
         });
 
@@ -280,7 +280,7 @@ describe('Metadata component', () => {
         await expect(await metadataViewPage.getPropertyText('properties.cm:description')).toEqual('check author example description');
 
         await loginPage.login(acsUser.email, acsUser.password);
-        await navigationBarPage.clickContentServicesButton();
+        await navigationBarPage.navigateToContentServices();
 
         await viewerPage.viewFile(pngFileModel.name);
         await viewerPage.checkFileIsLoaded();

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

@@ -229,7 +229,8 @@ describe('Permissions Component', () => {
             await permissionsPage.addPermissionsDialog.checkSearchUserInputIsDisplayed();
             await permissionsPage.addPermissionsDialog.searchUserOrGroup(groupBody.id);
             await permissionsPage.addPermissionsDialog.clickUserOrGroup(groupBody.displayName);
-            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded(groupBody.id);
+
+            await permissionsPage.addPermissionsDialog.checkGroupIsAdded(groupBody.id);
         });
 
         it('[C277100] Should display EVERYONE group in the search result set', async () => {
@@ -263,7 +264,7 @@ describe('Permissions Component', () => {
             await permissionsPage.addPermissionsDialog.checkSearchUserInputIsDisplayed();
             await permissionsPage.addPermissionsDialog.searchUserOrGroup(filePermissionUser.email);
             await permissionsPage.addPermissionsDialog.clickUserOrGroup(filePermissionUser.firstName);
-            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded(filePermissionUser.email);
+            await permissionsPage.addPermissionsDialog.checkUserIsAdded(filePermissionUser.email);
         });
 
         afterEach(async () => {
@@ -313,7 +314,7 @@ describe('Permissions Component', () => {
         it('[C276982] Should be able to remove User or Group from the locally set permissions', async () => {
             await expect(await permissionsPage.addPermissionsDialog.getRoleCellValue(filePermissionUser.email)).toEqual('Contributor');
             await permissionsPage.addPermissionsDialog.clickDeletePermissionButton();
-            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsDeleted(filePermissionUser.email);
+            await permissionsPage.addPermissionsDialog.checkUserIsDeleted(filePermissionUser.email);
         });
     });
 

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

@@ -188,7 +188,7 @@ describe('Permissions Component', () => {
             await permissionsPage.addPermissionsDialog.searchUserOrGroup(consumerUser.email);
 
             await permissionsPage.addPermissionsDialog.clickUserOrGroup(consumerUser.firstName);
-            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded(consumerUser.email);
+            await permissionsPage.addPermissionsDialog.checkUserIsAdded(consumerUser.email);
 
             await expect(await permissionsPage.addPermissionsDialog.getRoleCellValue(consumerUser.email)).toEqual('SiteCollaborator');