From d19631b0b78a7059dbc314b283cbc8d0ddca6730 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 2 Oct 2018 21:49:03 +0100 Subject: [PATCH] fix e2e test --- demo-shell/resources/i18n/en.json | 1 + .../directives/create_folder_directive.e2e.ts | 2 +- .../notifications_component.e2e.ts | 6 +----- e2e/content-services/unshare_file.e2e.ts | 1 - e2e/content-services/upload/excluded_file.e2e.ts | 6 ++++-- .../viewer/viewer_component.e2e.ts | 0 .../viewer_content_services_component.e2e.ts | 0 .../viewer/viewer_integration_with_router.e2e.ts | 0 e2e/core/{ => viewer}/viewer_properties.e2e.ts | 14 +++++++------- e2e/pages/adf/dialog/shareDialog.ts | 4 ++-- e2e/pages/adf/searchFiltersPage.js | 4 ++-- 11 files changed, 18 insertions(+), 20 deletions(-) rename e2e/{content-services => core}/viewer/viewer_component.e2e.ts (100%) rename e2e/{content-services => core}/viewer/viewer_content_services_component.e2e.ts (100%) rename e2e/{content-services => core}/viewer/viewer_integration_with_router.e2e.ts (100%) rename e2e/core/{ => viewer}/viewer_properties.e2e.ts (93%) diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json index 41a17a70d9..8ae79a22cb 100644 --- a/demo-shell/resources/i18n/en.json +++ b/demo-shell/resources/i18n/en.json @@ -120,6 +120,7 @@ "DISPLAY_NAME": "Display name", "IS_LOCKED": "Lock", "TAG": "Tag", + "NODE_ID": "Node id", "CREATED_BY": "Created by", "CREATED_ON": "Created on", "CREATED": "Created", diff --git a/e2e/content-services/directives/create_folder_directive.e2e.ts b/e2e/content-services/directives/create_folder_directive.e2e.ts index b1cb493b8c..c20fb941ab 100644 --- a/e2e/content-services/directives/create_folder_directive.e2e.ts +++ b/e2e/content-services/directives/create_folder_directive.e2e.ts @@ -31,7 +31,7 @@ import CONSTANTS = require('../../util/constants'); import { browser, protractor } from 'protractor'; -describe('Document List - Pagination', function () { +describe('Create folder directive', function () { let loginPage = new LoginPage(); let contentServicesPage = new ContentServicesPage(); diff --git a/e2e/content-services/notifications_component.e2e.ts b/e2e/content-services/notifications_component.e2e.ts index 1747ad0276..965bc9893d 100644 --- a/e2e/content-services/notifications_component.e2e.ts +++ b/e2e/content-services/notifications_component.e2e.ts @@ -42,10 +42,6 @@ describe('Notifications Component', () => { await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - done(); - }); - - beforeEach(async(done) => { loginPage.loginToContentServicesUsingUserModel(acsUser); notificationPage.goToNotificationsPage(); @@ -86,7 +82,7 @@ describe('Notifications Component', () => { notificationPage.enterDurationField(1000); notificationPage.clickCustomNotificationButton(); notificationPage.checkNotificationSnackBarIsDisplayed(); - browser.sleep(1000); + browser.sleep(1500); notificationPage.checkNotificationSnackBarIsNotDisplayed(); }); diff --git a/e2e/content-services/unshare_file.e2e.ts b/e2e/content-services/unshare_file.e2e.ts index ec0b86fcad..ba1820d090 100644 --- a/e2e/content-services/unshare_file.e2e.ts +++ b/e2e/content-services/unshare_file.e2e.ts @@ -84,7 +84,6 @@ describe('Unshare file', () => { contentServicesPage.clickShareButton(); shareDialog.checkDialogIsDisplayed(); - shareDialog.clickShareToggle(); shareDialog.checkShareLinkIsDisplayed(); let sharedLink = await shareDialog.getShareLink(); diff --git a/e2e/content-services/upload/excluded_file.e2e.ts b/e2e/content-services/upload/excluded_file.e2e.ts index 2f986ca40b..5d33a2bf6a 100644 --- a/e2e/content-services/upload/excluded_file.e2e.ts +++ b/e2e/content-services/upload/excluded_file.e2e.ts @@ -114,10 +114,11 @@ describe('Upload component - Excluded Files', () => { }); it('[C212862] Should not allow upload file excluded in the files extension of app.config.json', () => { - navigationBarPage.clickConfigEditorButton(); browser.refresh(); + navigationBarPage.clickConfigEditorButton(); + configEditorPage.clickFileConfiguration('adf-file-conf'); configEditorPage.clickClearButton(); @@ -143,10 +144,11 @@ describe('Upload component - Excluded Files', () => { }); it('[C274688] Should extension type added as excluded and accepted not be uploaded', () => { - navigationBarPage.clickConfigEditorButton(); browser.refresh(); + navigationBarPage.clickConfigEditorButton(); + configEditorPage.clickFileConfiguration('adf-file-conf'); configEditorPage.clickClearButton(); diff --git a/e2e/content-services/viewer/viewer_component.e2e.ts b/e2e/core/viewer/viewer_component.e2e.ts similarity index 100% rename from e2e/content-services/viewer/viewer_component.e2e.ts rename to e2e/core/viewer/viewer_component.e2e.ts diff --git a/e2e/content-services/viewer/viewer_content_services_component.e2e.ts b/e2e/core/viewer/viewer_content_services_component.e2e.ts similarity index 100% rename from e2e/content-services/viewer/viewer_content_services_component.e2e.ts rename to e2e/core/viewer/viewer_content_services_component.e2e.ts diff --git a/e2e/content-services/viewer/viewer_integration_with_router.e2e.ts b/e2e/core/viewer/viewer_integration_with_router.e2e.ts similarity index 100% rename from e2e/content-services/viewer/viewer_integration_with_router.e2e.ts rename to e2e/core/viewer/viewer_integration_with_router.e2e.ts diff --git a/e2e/core/viewer_properties.e2e.ts b/e2e/core/viewer/viewer_properties.e2e.ts similarity index 93% rename from e2e/core/viewer_properties.e2e.ts rename to e2e/core/viewer/viewer_properties.e2e.ts index aab845d758..211f2bddf7 100644 --- a/e2e/core/viewer_properties.e2e.ts +++ b/e2e/core/viewer/viewer_properties.e2e.ts @@ -17,19 +17,19 @@ import { browser } from 'protractor'; -import TestConfig = require('../test.config'); +import TestConfig = require('../../test.config'); -import LoginPage = require('../pages/adf/loginPage'); -import ContentServicesPage = require('../pages/adf/contentServicesPage'); -import { ViewerPage } from '../pages/adf/viewerPage'; +import LoginPage = require('../../pages/adf/loginPage'); +import ContentServicesPage = require('../../pages/adf/contentServicesPage'); +import { ViewerPage } from '../../pages/adf/viewerPage'; -import resources = require('../util/resources'); +import resources = require('../../util/resources'); -import FileModel = require('../models/ACS/fileModel'); +import FileModel = require('../../models/ACS/fileModel'); import AcsUserModel = require('../models/ACS/acsUserModel'); import AlfrescoApi = require('alfresco-js-api-node'); -import { UploadActions } from '../actions/ACS/upload.actions'; +import { UploadActions } from '../../actions/ACS/upload.actions'; describe('Viewer - properties', () => { diff --git a/e2e/pages/adf/dialog/shareDialog.ts b/e2e/pages/adf/dialog/shareDialog.ts index 27fd332fd1..e143219a8a 100644 --- a/e2e/pages/adf/dialog/shareDialog.ts +++ b/e2e/pages/adf/dialog/shareDialog.ts @@ -20,9 +20,9 @@ import Util = require('../../../util/util'); export class ShareDialog { - dialogTitle = element(by.id('adf-share-dialog-title')); + dialogTitle = element(by.css('[data-automation-id="adf-share-dialog-title"]')); shareToggle = element(by.id('adf-share-toggle')); - shareLink = element(by.id('adf-share-link')); + shareLink = element(by.css('[data-automation-id="adf-share-link"')); closeButton = element(by.css('button[class="mat-button mat-primary"]')); checkDialogIsDisplayed() { diff --git a/e2e/pages/adf/searchFiltersPage.js b/e2e/pages/adf/searchFiltersPage.js index 82e9e2c206..f1ed2e5d20 100644 --- a/e2e/pages/adf/searchFiltersPage.js +++ b/e2e/pages/adf/searchFiltersPage.js @@ -72,13 +72,13 @@ var SearchFiltersPage = function () { }; this.selectFileType = function (fileType) { - let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-1:Type-${fileType}']`)); + let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-1:Type-${fileType}'] .mat-checkbox-inner-container`)); Util.waitUntilElementIsClickable(result); result.click(); }; this.selectCreator = function (creatorName) { - let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-3:Creator-${creatorName}']`)); + let result = element(by.css(`mat-checkbox[data-automation-id='checkbox-3:Creator-${creatorName}'] .mat-checkbox-inner-container`)); Util.waitUntilElementIsClickable(result); result.click(); };