split upload files to optimize re-execute in case of failing

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

@@ -0,0 +1,130 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser } from 'protractor';
+
+import { LoginPage } from '../../pages/adf/loginPage';
+import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
+import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
+
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
+
+import TestConfig = require('../../test.config');
+import resources = require('../../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+
+describe('Upload component', () => {
+
+    let contentServicesPage = new ContentServicesPage();
+    let uploadDialog = new UploadDialog();
+    let uploadToggles = new UploadToggles();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+    let uploadActions = new UploadActions();
+
+    let firstPdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
+    });
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+    let largeFile = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location
+    });
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
+
+        Object.assign(firstPdfFileModel, pdfUploadedFile.entry);
+
+        done();
+    });
+
+    beforeEach(() => {
+        contentServicesPage.goToDocumentList();
+    });
+
+    afterEach(async (done) => {
+        let nodesPromise = await contentServicesPage.getContentList().getAllNodeIdInList();
+
+        nodesPromise.forEach(async (currentNodePromise) => {
+            await currentNodePromise.then(async (currentNode) => {
+                if (currentNode && currentNode !== 'Node id') {
+                    await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, currentNode);
+                }
+            });
+        });
+
+        done();
+    });
+
+    it('[C272792] Should be possible to cancel upload of a big file using row cancel icon', () => {
+        browser.executeScript(' setTimeout(() => {document.querySelector(\'mat-icon[class*="adf-file-uploading-row__action"]\').click();}, 3000)');
+
+        contentServicesPage.uploadFile(largeFile.location);
+
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
+    });
+
+    it('[C287790] Should be possible to cancel upload of a big file through the cancel uploads button', () => {
+        browser.executeScript(' setInterval(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' +
+            'document.querySelector("#adf-upload-dialog-cancel").click();  }, 500)');
+
+        contentServicesPage.uploadFile(largeFile.location);
+
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
+    });
+
+    it('[C272793] Should be able to cancel multiple files upload', () => {
+        browser.executeScript(' setInterval(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' +
+            'document.querySelector("#adf-upload-dialog-cancel").click();  }, 500)');
+
+        uploadToggles.enableMultipleFileUpload();
+        contentServicesPage.uploadMultipleFile([pngFileModel.location, largeFile.location]);
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(pngFileModel.name).checkContentIsNotDisplayed(largeFile.name);
+        uploadToggles.disableMultipleFileUpload();
+    });
+
+});

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

@@ -0,0 +1,174 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { LoginPage } from '../../pages/adf/loginPage';
+import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
+import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
+import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
+
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { FileModel } from '../../models/ACS/fileModel';
+
+import TestConfig = require('../../test.config');
+import resources = require('../../util/resources');
+
+import AlfrescoApi = require('alfresco-js-api-node');
+import { UploadActions } from '../../actions/ACS/upload.actions';
+
+describe('Upload component', () => {
+
+    let contentServicesPage = new ContentServicesPage();
+    let uploadDialog = new UploadDialog();
+    let uploadToggles = new UploadToggles();
+    let loginPage = new LoginPage();
+    let acsUser = new AcsUserModel();
+    let uploadActions = new UploadActions();
+
+    let firstPdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
+    });
+    let docxFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location
+    });
+    let pdfFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
+    });
+    let pngFileModelTwo = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location
+    });
+    let pngFileModel = new FileModel({
+        'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
+        'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
+    });
+    let filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location];
+    let filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
+
+    beforeAll(async (done) => {
+        this.alfrescoJsApi = new AlfrescoApi({
+            provider: 'ECM',
+            hostEcm: TestConfig.adf.url
+        });
+
+        await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
+
+        await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
+
+        await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
+
+        loginPage.loginToContentServicesUsingUserModel(acsUser);
+
+        contentServicesPage.goToDocumentList();
+
+        let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
+
+        Object.assign(firstPdfFileModel, pdfUploadedFile.entry);
+
+        done();
+    });
+
+    beforeEach(() => {
+        contentServicesPage.goToDocumentList();
+    });
+
+    afterEach(async (done) => {
+        let nodesPromise = await contentServicesPage.getContentList().getAllNodeIdInList();
+
+        nodesPromise.forEach(async (currentNodePromise) => {
+            await currentNodePromise.then(async (currentNode) => {
+                if (currentNode && currentNode !== 'Node id') {
+                    await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, currentNode);
+                }
+            });
+        });
+
+        done();
+    });
+
+    it('[C260143] Should be possible to maximize/minimize the upload dialog', () => {
+        contentServicesPage
+            .uploadFile(docxFileModel.location)
+            .checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.fileIsUploaded(docxFileModel.name).checkCloseButtonIsDisplayed();
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.minimizeUploadDialog().dialogIsMinimized();
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.maximizeUploadDialog().dialogIsDisplayed().fileIsUploaded(docxFileModel.name);
+        expect(uploadDialog.numberOfCurrentFilesUploaded()).toEqual('1');
+        expect(uploadDialog.numberOfInitialFilesUploaded()).toEqual('1');
+        uploadDialog.checkCloseButtonIsDisplayed().clickOnCloseButton().dialogIsNotDisplayed();
+    });
+
+    it('[C291902] Should be shown upload counter display in dialog box', () => {
+        contentServicesPage
+            .uploadFile(docxFileModel.location)
+            .checkContentIsDisplayed(docxFileModel.name);
+
+        uploadDialog.fileIsUploaded(docxFileModel.name).checkCloseButtonIsDisplayed();
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 1 / 1');
+        uploadDialog.checkCloseButtonIsDisplayed().clickOnCloseButton().dialogIsNotDisplayed();
+    });
+
+    it('[C260168] Should be possible to cancel upload using dialog icon', () => {
+        contentServicesPage.uploadFile(pdfFileModel.location)
+            .checkContentIsDisplayed(pdfFileModel.name);
+        uploadDialog.removeUploadedFile(pdfFileModel.name).fileIsCancelled(pdfFileModel.name);
+        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+        contentServicesPage.checkContentIsNotDisplayed(pdfFileModel.name);
+    });
+
+    it('[C260176] Should remove files from upload dialog box when closed', () => {
+        contentServicesPage.uploadFile(pngFileModelTwo.location).checkContentIsDisplayed(pngFileModelTwo.name);
+
+        uploadDialog.fileIsUploaded(pngFileModelTwo.name);
+
+        contentServicesPage.uploadFile(pngFileModel.location).checkContentIsDisplayed(pngFileModel.name);
+
+        uploadDialog.fileIsUploaded(pngFileModel.name).fileIsUploaded(pngFileModelTwo.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
+
+        uploadDialog.fileIsUploaded(pdfFileModel.name).fileIsNotDisplayedInDialog(pngFileModel.name).fileIsNotDisplayedInDialog(pngFileModelTwo.name);
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+    });
+
+    it('[C260170] Should be possible to upload multiple files', () => {
+        contentServicesPage.goToDocumentList();
+        contentServicesPage.checkAcsContainer();
+
+        uploadToggles.enableMultipleFileUpload();
+
+        contentServicesPage.uploadMultipleFile(filesLocation).checkContentsAreDisplayed(filesName);
+
+        uploadDialog.filesAreUploaded(filesName);
+
+        expect(uploadDialog.getTitleText()).toEqual('Uploaded 4 / 4');
+
+        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
+
+        uploadToggles.disableMultipleFileUpload();
+    });
+
+});

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

@@ -57,18 +57,10 @@ describe('Upload component', () => {
         'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
         'location': resources.Files.ADF_DOCUMENTS.PDF.file_location
     });
-    let pngFileModelTwo = new FileModel({
-        'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
-        'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location
-    });
     let pngFileModel = new FileModel({
         'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
         'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
     });
-    let largeFile = new FileModel({
-        'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name,
-        'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location
-    });
     let fileWithSpecificSize = new FileModel({
         'name': resources.Files.ADF_DOCUMENTS.TXT_400B.file_name,
         'location': resources.Files.ADF_DOCUMENTS.TXT_400B.file_location
@@ -87,8 +79,6 @@ describe('Upload component', () => {
     });
     let uploadedFileInFolder = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.FILE_INSIDE_FOLDER_ONE.file_name });
     let uploadedFileInFolderTwo = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.FILE_INSIDE_FOLDER_TWO.file_name });
-    let filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location];
-    let filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
 
     beforeAll(async (done) => {
         this.alfrescoJsApi = new AlfrescoApi({
@@ -198,58 +188,6 @@ describe('Upload component', () => {
         uploadDialog.checkCloseButtonIsDisplayed().clickOnCloseButton().dialogIsNotDisplayed();
     });
 
-    it('[C291902] Should be shown upload counter display in dialog box', () => {
-        contentServicesPage
-            .uploadFile(docxFileModel.location)
-            .checkContentIsDisplayed(docxFileModel.name);
-
-        uploadDialog.fileIsUploaded(docxFileModel.name).checkCloseButtonIsDisplayed();
-        expect(uploadDialog.getTitleText()).toEqual('Uploaded 1 / 1');
-        uploadDialog.checkCloseButtonIsDisplayed().clickOnCloseButton().dialogIsNotDisplayed();
-    });
-
-    it('[C260168] Should be possible to cancel upload using dialog icon', () => {
-        contentServicesPage.uploadFile(pdfFileModel.location)
-            .checkContentIsDisplayed(pdfFileModel.name);
-        uploadDialog.removeUploadedFile(pdfFileModel.name).fileIsCancelled(pdfFileModel.name);
-        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-        contentServicesPage.checkContentIsNotDisplayed(pdfFileModel.name);
-    });
-
-    it('[C272792] Should be possible to cancel upload of a big file using row cancel icon', () => {
-        browser.executeScript(' setTimeout(() => {document.querySelector(\'mat-icon[class*="adf-file-uploading-row__action"]\').click();}, 3000)');
-
-        contentServicesPage.uploadFile(largeFile.location);
-
-        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
-    });
-
-    it('[C287790] Should be possible to cancel upload of a big file through the cancel uploads button', () => {
-        browser.executeScript(' setInterval(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' +
-            'document.querySelector("#adf-upload-dialog-cancel").click();  }, 500)');
-
-        contentServicesPage.uploadFile(largeFile.location);
-
-        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-        contentServicesPage.checkContentIsNotDisplayed(largeFile.name);
-    });
-
-    it('[C272793] Should be able to cancel multiple files upload', () => {
-        browser.executeScript(' setInterval(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' +
-            'document.querySelector("#adf-upload-dialog-cancel").click();  }, 500)');
-
-        uploadToggles.enableMultipleFileUpload();
-        contentServicesPage.uploadMultipleFile([pngFileModel.location, largeFile.location]);
-        expect(uploadDialog.getTitleText()).toEqual('Upload canceled');
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-        contentServicesPage.checkContentIsNotDisplayed(pngFileModel.name).checkContentIsNotDisplayed(largeFile.name);
-        uploadToggles.disableMultipleFileUpload();
-    });
-
     it('[C272794] Should display tooltip for uploading files', () => {
         uploadToggles.enableMultipleFileUpload();
         browser.driver.sleep(1000);
@@ -334,39 +272,6 @@ describe('Upload component', () => {
         uploadToggles.disableVersioning();
     });
 
-    it('[C260176] Should remove files from upload dialog box when closed', () => {
-        contentServicesPage.uploadFile(pngFileModelTwo.location).checkContentIsDisplayed(pngFileModelTwo.name);
-
-        uploadDialog.fileIsUploaded(pngFileModelTwo.name);
-
-        contentServicesPage.uploadFile(pngFileModel.location).checkContentIsDisplayed(pngFileModel.name);
-
-        uploadDialog.fileIsUploaded(pngFileModel.name).fileIsUploaded(pngFileModelTwo.name);
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-
-        contentServicesPage.uploadFile(pdfFileModel.location).checkContentIsDisplayed(pdfFileModel.name);
-
-        uploadDialog.fileIsUploaded(pdfFileModel.name).fileIsNotDisplayedInDialog(pngFileModel.name).fileIsNotDisplayedInDialog(pngFileModelTwo.name);
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-    });
-
-    it('[C260170] Should be possible to upload multiple files', () => {
-        contentServicesPage.goToDocumentList();
-        contentServicesPage.checkAcsContainer();
-
-        uploadToggles.enableMultipleFileUpload();
-
-        contentServicesPage.uploadMultipleFile(filesLocation).checkContentsAreDisplayed(filesName);
-
-        uploadDialog.filesAreUploaded(filesName);
-
-        expect(uploadDialog.getTitleText()).toEqual('Uploaded 4 / 4');
-
-        uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
-
-        uploadToggles.disableMultipleFileUpload();
-    });
-
     it('[C260174] Should be possible to set a max size', () => {
         contentServicesPage.goToDocumentList();
         contentServicesPage.checkAcsContainer();