Disable control flow e2e ADF (#4954)

* update project script possible different JS-API

* first commit no controll flow

* second commit no controll flow

* third commit no controll flow

* 4 commit no controll flow

* 5 commit no controll flow

* 6 commit no controll flow

* 7 commit no controll flow

* 8 commit no controll flow

* 9 commit no controll flow

* 10 commit no controll flow

* 11 commit no controll flow

* 12 commit no controll flow

* 13 commit no controll flow

* 14 commit no controll flow

* 15 commit no controll flow

* 16 commit no controll flow

* 17 commit no controll flow

* 18 commit no controll flow

* 19 commit no controll flow

* 20 commit no controll flow

* remove wdpromise, protractor promise and deferred promises

* - fixed some incorrect “expect” calls
- fixed some matchers
- removed “return this;” when not needed
- added a few more await-s

* forgot a file

* fix some failing tests

* replaced driver calls with browser calls and enabled back waitForAngular

* fix rightClick methods and hopefully some tests

* fix settings-component

* some more fixes for core and content tests

* try to fix some more issues

* linting

* revert some changes, allowing download on headless chrome won’t work with multiple browser instances

* fixes for Search tests

* try to remove some wait calls

* fix build

* increase allScriptsTimeout and try another protractor and web driver version

* improve navigation methods

* some fixes for notification history and login sso

* forgot a space

* fix packages and enable some screenshots

* navigation bar fixes

* fix some test

* some fixes for notification history and navigation bar
use correct visibility method in attachFileWidget test

* fix searching and another fix for navigation

* try solve sso login

* some more fixes

* refactor async forEach into for..of

* try fix for search tests

* resolve rebabse problems

* remove install

* fix lint

* fix core e2e

* fix core e2e

* fix core e2e

* fix ps tests

* fix some tests

* fix core e2e

* fix core e2e

* fix core

* fix some issues PS

* fix core

* fix core

* fix some ps test

* fix rebase issues

* remove save

* fix url regressed after rebase

* fix url regressed after rebase

* fix ps and core

* fix lint

* more parallel e2e ps

* fix some ps cloud test

* some cloud fix

* fix lint

* fix some test

* remove files to be ignored

* out-tsc

* improve one cs test

* fix candidate base app

* fix ps test

* remove click function

* clean methods alrady present in browser action

* try ugly wait

* move wait

* remove duplicate call

* remove underscore

* fix after review

* fix imports

* minor cosmetic fixes

* fix comments test
This commit is contained in:
Eugenio Romano
2019-08-17 14:32:02 +02:00
committed by GitHub
parent 4f3cf669f2
commit 83412bb9b6
328 changed files with 17653 additions and 18793 deletions

View File

@@ -47,24 +47,19 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
title: StringUtil.generateRandomString(8),
visibility: 'PUBLIC'
});
await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, {
id: acsUser.id,
role: CONSTANTS.CS_USER_ROLES.MANAGER
});
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
@@ -75,32 +70,28 @@ describe('Viewer', () => {
let uploadedArchives;
let archiveFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
archiveFolderUploaded = await uploadActions.createFolder(archiveFolderInfo.name, '-my-');
uploadedArchives = await uploadActions.uploadFolder(archiveFolderInfo.location, archiveFolderUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(archiveFolderUploaded.entry.id);
done();
});
it('[C260517] Should be possible to open any Archive file', () => {
contentServicesPage.doubleClickRow('archive');
uploadedArchives.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
it('[C260517] Should be possible to open any Archive file', async () => {
await contentServicesPage.doubleClickRow('archive');
for (const file of uploadedArchives) {
if (file.entry.name !== '.DS_Store') {
await contentServicesPage.doubleClickRow(file.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}
});
});

View File

@@ -53,7 +53,7 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -70,7 +70,7 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
pngFileUploaded = await uploadActions.uploadFile(pngFileInfo.location, pngFileInfo.name, site.entry.guid);
done();
});
afterAll(async () => {
@@ -80,14 +80,14 @@ describe('Viewer', () => {
it('[C272813] Should be redirected to site when opening and closing a file in a site', async () => {
await loginPage.loginToContentServicesUsingUserModel(acsUser);
navigationBarPage.goToSite(site);
contentServicesPage.checkAcsContainer();
await navigationBarPage.goToSite(site);
await contentServicesPage.checkAcsContainer();
viewerPage.viewFile(pngFileUploaded.entry.name);
await viewerPage.viewFile(pngFileUploaded.entry.name);
viewerPage.checkImgViewerIsDisplayed();
await viewerPage.checkImgViewerIsDisplayed();
viewerPage.clickCloseButton();
await viewerPage.clickCloseButton();
});
describe('Other Folder Uploaded', () => {
@@ -95,32 +95,30 @@ describe('Viewer', () => {
let uploadedOthers;
let otherFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
otherFolderUploaded = await uploadActions.createFolder(otherFolderInfo.name, '-my-');
uploadedOthers = await uploadActions.uploadFolder(otherFolderInfo.location, otherFolderUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(otherFolderUploaded.entry.id);
done();
});
it('[C280012] Should be possible to open any other Document supported extension', () => {
contentServicesPage.doubleClickRow('other');
uploadedOthers.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
it('[C280012] Should be possible to open any other Document supported extension', async () => {
await contentServicesPage.doubleClickRow('other');
for (const file of uploadedOthers) {
if (file.entry.name !== '.DS_Store') {
await contentServicesPage.doubleClickRow(file.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}
});
});

View File

@@ -24,15 +24,12 @@ import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();
let site;
const acsUser = new AcsUserModel();
@@ -46,7 +43,7 @@ describe('Viewer', () => {
});
const uploadActions = new UploadActions(this.alfrescoJsApi);
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -62,45 +59,37 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
describe('Excel Folder Uploaded', () => {
let uploadedExcels;
let excelFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
excelFolderUploaded = await uploadActions.createFolder(excelFolderInfo.name, '-my-');
uploadedExcels = await uploadActions.uploadFolder(excelFolderInfo.location, excelFolderUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(excelFolderUploaded.entry.id);
done();
});
it('[C280008] Should be possible to open any Excel file', () => {
contentServicesPage.doubleClickRow('excel');
uploadedExcels.forEach((currentFile) => {
it('[C280008] Should be possible to open any Excel file', async () => {
await contentServicesPage.doubleClickRow('excel');
for (const currentFile of uploadedExcels) {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded(currentFile.entry.name);
viewerPage.clickCloseButton();
await contentServicesPage.doubleClickRow(currentFile.entry.name);
await viewerPage.checkFileIsLoaded(currentFile.entry.name);
await viewerPage.clickCloseButton();
}
});
}, 5 * 60 * 1000);
}
});
});

View File

@@ -24,15 +24,12 @@ import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host
@@ -51,7 +48,7 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -67,11 +64,6 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
describe('Image Folder Uploaded', () => {
@@ -79,7 +71,7 @@ describe('Viewer', () => {
let uploadedImages, uploadedImgRenditionFolderInfo;
let imgFolderUploaded, imgFolderRenditionUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
imgFolderUploaded = await uploadActions.createFolder(imgFolderInfo.name, '-my-');
uploadedImages = await uploadActions.uploadFolder(imgFolderInfo.location, imgFolderUploaded.entry.id);
@@ -89,37 +81,33 @@ describe('Viewer', () => {
uploadedImgRenditionFolderInfo = await uploadActions.uploadFolder(imgRenditionFolderInfo.location, imgFolderRenditionUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(imgFolderUploaded.entry.id);
done();
});
it('[C279966] Should be possible to open any Image supported extension', () => {
contentServicesPage.doubleClickRow('images');
uploadedImages.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkImgViewerIsDisplayed();
viewerPage.clickCloseButton();
it('[C279966] Should be possible to open any Image supported extension', async () => {
await contentServicesPage.doubleClickRow('images');
for (const image of uploadedImages) {
if (image.entry.name !== '.DS_Store') {
await contentServicesPage.doubleClickRow(image.entry.name);
await viewerPage.checkImgViewerIsDisplayed();
await viewerPage.clickCloseButton();
}
});
contentServicesPage.doubleClickRow('images-rendition');
uploadedImgRenditionFolderInfo.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
}
await contentServicesPage.doubleClickRow('images-rendition');
for (const item of uploadedImgRenditionFolderInfo) {
if (item.entry.name !== '.DS_Store') {
await contentServicesPage.doubleClickRow(item.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}, 5 * 60 * 1000);
}
});
});

View File

@@ -24,19 +24,16 @@ import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host
});
provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host
});
const uploadActions = new UploadActions(this.alfrescoJsApi);
let site;
@@ -47,7 +44,7 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -63,11 +60,6 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
describe('PowerPoint Folder Uploaded', () => {
@@ -75,33 +67,32 @@ describe('Viewer', () => {
let uploadedPpt;
let pptFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
pptFolderUploaded = await uploadActions.createFolder(pptFolderInfo.name, '-my-');
uploadedPpt = await uploadActions.uploadFolder(pptFolderInfo.location, pptFolderUploaded.entry.id);
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await loginPage.loginToContentServicesUsingUserModel(acsUser);
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(pptFolderUploaded.entry.id);
done();
});
it('[C280009] Should be possible to open any PowerPoint file', () => {
contentServicesPage.doubleClickRow('ppt');
it('[C280009] Should be possible to open any PowerPoint file', async () => {
await contentServicesPage.doubleClickRow('ppt');
uploadedPpt.forEach((currentFile) => {
for (const currentFile of uploadedPpt) {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
await contentServicesPage.doubleClickRow(currentFile.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}, 5 * 60 * 1000);
}
});
});

View File

@@ -24,19 +24,16 @@ import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host
});
provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host
});
const uploadActions = new UploadActions(this.alfrescoJsApi);
let site;
const acsUser = new AcsUserModel();
@@ -46,7 +43,7 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -62,11 +59,6 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
describe('Text Folder Uploaded', () => {
@@ -74,32 +66,30 @@ describe('Viewer', () => {
let uploadedTexts;
let textFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
textFolderUploaded = await uploadActions.createFolder(textFolderInfo.name, '-my-');
uploadedTexts = await uploadActions.uploadFolder(textFolderInfo.location, textFolderUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(textFolderUploaded.entry.id);
done();
});
it('[C280010] Should be possible to open any Text file', () => {
contentServicesPage.doubleClickRow('text');
uploadedTexts.forEach((currentFile) => {
it('[C280010] Should be possible to open any Text file', async () => {
await contentServicesPage.doubleClickRow('text');
for (const currentFile of uploadedTexts) {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
await contentServicesPage.doubleClickRow(currentFile.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}
});
});

View File

@@ -46,7 +46,7 @@ describe('Viewer', () => {
'location': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location
});
beforeAll(async (done) => {
beforeAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -62,7 +62,6 @@ describe('Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
done();
});
afterAll(async () => {
@@ -74,32 +73,30 @@ describe('Viewer', () => {
let uploadedWords;
let wordFolderUploaded;
beforeAll(async (done) => {
beforeAll(async () => {
wordFolderUploaded = await uploadActions.createFolder(wordFolderInfo.name, '-my-');
uploadedWords = await uploadActions.uploadFolder(wordFolderInfo.location, wordFolderUploaded.entry.id);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
await contentServicesPage.goToDocumentList();
done();
});
afterAll(async (done) => {
afterAll(async () => {
await uploadActions.deleteFileOrFolder(wordFolderUploaded.entry.id);
done();
});
it('[C280011] Should be possible to open any Word file', () => {
contentServicesPage.doubleClickRow('word');
uploadedWords.forEach((currentFile) => {
it('[C280011] Should be possible to open any Word file', async () => {
await contentServicesPage.doubleClickRow('word');
for (const currentFile of uploadedWords) {
if (currentFile.entry.name !== '.DS_Store') {
contentServicesPage.doubleClickRow(currentFile.entry.name);
viewerPage.checkFileIsLoaded();
viewerPage.clickCloseButton();
await contentServicesPage.doubleClickRow(currentFile.entry.name);
await viewerPage.checkFileIsLoaded();
await viewerPage.clickCloseButton();
}
});
}
});
});