inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix share test and search condition (#5401)

Browse Source
This commit is contained in:
Eugenio Romano
2020-01-25 10:05:54 +01:00
committed by GitHub
parent 5e284d487c
commit 469a806894
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
e2e/content-services/share-file/share-file.e2e.ts
View File

@@ -61,26 +61,19 @@ describe('Share file', () => {
const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-'); const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
nodeId = pngUploadedFile.entry.id; nodeId = pngUploadedFile.entry.id;
await loginPage.loginToContentServicesUsingUserModel(acsUser);
await navigationBarPage.clickContentServicesButton();
}); });
afterAll(async () => { afterAll(async () => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFileOrFolder(nodeId); await uploadActions.deleteFileOrFolder(nodeId);
}); });
describe('Shared link dialog', () => { describe('Shared link dialog', () => {
beforeAll(async () => { beforeAll(async () => {
await loginPage.loginToContentServicesUsingUserModel(acsUser);
await navigationBarPage.clickContentServicesButton();
await contentListPage.selectRow(pngFileModel.name); await contentListPage.selectRow(pngFileModel.name);
});
afterEach(async () => {
await BrowserActions.closeMenuAndDialogs(); await BrowserActions.closeMenuAndDialogs();
}); });
@@ -88,12 +81,14 @@ describe('Share file', () => {
await contentServicesPage.clickShareButton(); await contentServicesPage.clickShareButton();
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.shareToggleButtonIsChecked(); await shareDialog.shareToggleButtonIsChecked();
await BrowserActions.closeMenuAndDialogs();
}); });
it('[C286544] Should display notification when clicking URL copy button', async () => { it('[C286544] Should display notification when clicking URL copy button', async () => {
await contentServicesPage.clickShareButton(); await contentServicesPage.clickShareButton();
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.clickShareLinkButton(); await shareDialog.clickShareLinkButton();
await BrowserActions.closeMenuAndDialogs();
await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard'); await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
}); });
@@ -101,6 +96,7 @@ describe('Share file', () => {
await contentServicesPage.clickShareButton(); await contentServicesPage.clickShareButton();
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.checkShareLinkIsDisplayed(); await shareDialog.checkShareLinkIsDisplayed();
await BrowserActions.closeMenuAndDialogs();
}); });
it('[C286578] Should disable today option in expiration day calendar', async () => { it('[C286578] Should disable today option in expiration day calendar', async () => {
@@ -108,6 +104,7 @@ describe('Share file', () => {
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.clickDateTimePickerButton(); await shareDialog.clickDateTimePickerButton();
await shareDialog.calendarTodayDayIsDisabled(); await shareDialog.calendarTodayDayIsDisabled();
await BrowserActions.closeMenuAndDialogs();
}); });
it('[C286548] Should be possible to set expiry date for link', async () => { it('[C286548] Should be possible to set expiry date for link', async () => {
@@ -132,6 +129,7 @@ describe('Share file', () => {
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.clickDateTimePickerButton(); await shareDialog.clickDateTimePickerButton();
await shareDialog.calendarTodayDayIsDisabled(); await shareDialog.calendarTodayDayIsDisabled();
await BrowserActions.closeMenuAndDialogs();
}); });
it('[C310329] Should be possible to set expiry date only for link', async () => { it('[C310329] Should be possible to set expiry date only for link', async () => {
@@ -152,17 +150,11 @@ describe('Share file', () => {
}); });
describe('Shared link preview', () => { describe('Shared link preview', () => {
afterEach(async() => {
await loginPage.loginToContentServicesUsingUserModel(acsUser);
await navigationBarPage.clickContentServicesButton();
}); beforeEach(async () => {
beforeAll(async () => {
await loginPage.loginToContentServicesUsingUserModel(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser);
await navigationBarPage.clickContentServicesButton(); await navigationBarPage.clickContentServicesButton();
await contentServicesPage.waitForTableBody(); await contentServicesPage.waitForTableBody();
}); });
it('[C286565] Should open file when logged user access shared link', async () => { it('[C286565] Should open file when logged user access shared link', async () => {
@@ -171,6 +163,7 @@ describe('Share file', () => {
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.clickShareLinkButton(); await shareDialog.clickShareLinkButton();
const sharedLink = await shareDialog.getShareLink(); const sharedLink = await shareDialog.getShareLink();
await BrowserActions.closeMenuAndDialogs();
await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard'); await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
await BrowserActions.getUrl(sharedLink); await BrowserActions.getUrl(sharedLink);
await viewerPage.checkFileNameIsDisplayed(pngFileModel.name); await viewerPage.checkFileNameIsDisplayed(pngFileModel.name);
@@ -188,6 +181,7 @@ describe('Share file', () => {
await shareDialog.checkDialogIsDisplayed(); await shareDialog.checkDialogIsDisplayed();
await shareDialog.clickShareLinkButton(); await shareDialog.clickShareLinkButton();
const secondSharedLink = await shareDialog.getShareLink(); const secondSharedLink = await shareDialog.getShareLink();
await BrowserActions.closeMenuAndDialogs();
await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard'); await notificationHistoryPage.checkNotifyContains('Link copied to the clipboard');
await expect(sharedLink).toEqual(secondSharedLink); await expect(sharedLink).toEqual(secondSharedLink);
await BrowserActions.getUrl(sharedLink); await BrowserActions.getUrl(sharedLink);

2
lib/content-services/src/lib/search/components/search-control.component.ts
View File

@@ -183,7 +183,7 @@ export class SearchControlComponent implements OnDestroy {
} }
private isListElement($event: any): boolean { private isListElement($event: any): boolean {
return $event.relatedTarget && $event.relatedTarget.children[0].className === 'mat-list-item-content'; return $event.relatedTarget && $event.relatedTarget.children[0] && $event.relatedTarget.children[0].className === 'mat-list-item-content';
} }
private getNextElementSibling(node: Element): Element { private getNextElementSibling(node: Element): Element {