From 898c2be633087991ee460205b8e77371e4c94673 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 11 Oct 2018 20:10:18 +0100 Subject: [PATCH] [no-issue] convert navigationBarPage to ts (#3881) * convert navigationBarPage to ts * lint --- .../document_list_component.e2e.ts | 2 +- .../document_list_pagination.e2e.ts | 2 +- .../trashcan_pagination.e2e.ts | 2 +- .../upload/excluded_file.e2e.ts | 2 +- .../upload/user_permission.e2e.ts | 2 +- .../version/version-permissions.e2e.ts | 2 +- .../card-view/aspect-oriented-config.e2e.ts | 2 +- e2e/core/card-view/card-view-component.e2e.ts | 3 +- .../card-view/metadata-permissions.e2e.ts | 2 +- e2e/core/header_component.e2e.ts | 3 +- e2e/core/login/login_component.e2e.ts | 3 +- e2e/core/login/redirection.e2e.ts | 2 +- e2e/core/theming_component.e2e.ts | 2 +- e2e/core/user_info_component.e2e.ts | 2 +- e2e/core/viewer/viewer_component.e2e.ts | 2 +- e2e/insights/analytics-component.e2e.ts | 2 +- e2e/pages/adf/contentServicesPage.ts | 3 +- e2e/pages/adf/navigationBarPage.js | 163 ------------------ e2e/pages/adf/navigationBarPage.ts | 150 ++++++++++++++++ e2e/process-services/apps-section.e2e.ts | 2 +- .../custom_process_filters.e2e.ts | 1 - .../empty_process_list_component.e2e.ts | 2 +- .../process_filters_component.e2e.ts | 3 +- .../start_process_component.e2e.ts | 4 +- .../task_filters_component.e2e.ts | 2 +- .../task_filters_sorting.e2e.ts | 2 +- 26 files changed, 178 insertions(+), 189 deletions(-) delete mode 100644 e2e/pages/adf/navigationBarPage.js create mode 100644 e2e/pages/adf/navigationBarPage.ts diff --git a/e2e/content-services/document-list/document_list_component.e2e.ts b/e2e/content-services/document-list/document_list_component.e2e.ts index 04285f0d1a..32d2ffd715 100644 --- a/e2e/content-services/document-list/document_list_component.e2e.ts +++ b/e2e/content-services/document-list/document_list_component.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/content-services/document-list/document_list_pagination.e2e.ts b/e2e/content-services/document-list/document_list_pagination.e2e.ts index 65b63d513f..4505d94e6a 100644 --- a/e2e/content-services/document-list/document_list_pagination.e2e.ts +++ b/e2e/content-services/document-list/document_list_pagination.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import PaginationPage = require('../../pages/adf/paginationPage'); -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); import FolderModel = require('../../models/ACS/folderModel'); diff --git a/e2e/content-services/trashcan_pagination.e2e.ts b/e2e/content-services/trashcan_pagination.e2e.ts index daa5b86bba..d2087acff2 100644 --- a/e2e/content-services/trashcan_pagination.e2e.ts +++ b/e2e/content-services/trashcan_pagination.e2e.ts @@ -19,7 +19,7 @@ import { LoginPage } from '../pages/adf/loginPage'; import { TrashcanPage } from '../pages/adf/trashcanPage'; import PaginationPage = require('../pages/adf/paginationPage'); -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import AcsUserModel = require('../models/ACS/acsUserModel'); import FolderModel = require('../models/ACS/folderModel'); diff --git a/e2e/content-services/upload/excluded_file.e2e.ts b/e2e/content-services/upload/excluded_file.e2e.ts index c42a6632fe..6a9d86fb88 100644 --- a/e2e/content-services/upload/excluded_file.e2e.ts +++ b/e2e/content-services/upload/excluded_file.e2e.ts @@ -21,7 +21,7 @@ import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import UploadDialog = require('../../pages/adf/dialog/uploadDialog'); import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); import FileModel = require('../../models/ACS/fileModel'); diff --git a/e2e/content-services/upload/user_permission.e2e.ts b/e2e/content-services/upload/user_permission.e2e.ts index cf37f55d56..9c019400d1 100644 --- a/e2e/content-services/upload/user_permission.e2e.ts +++ b/e2e/content-services/upload/user_permission.e2e.ts @@ -23,7 +23,7 @@ import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import UploadDialog = require('../../pages/adf/dialog/uploadDialog'); import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NotificationPage } from '../../pages/adf/notificationPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 970c49f8fc..97b8d10901 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -19,7 +19,7 @@ import { element, by } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; import ContentListPage = require('../../pages/adf/dialog/contentList'); -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import UploadDialog = require('../../pages/adf/dialog/uploadDialog'); import { NotificationPage } from '../../pages/adf/notificationPage'; diff --git a/e2e/core/card-view/aspect-oriented-config.e2e.ts b/e2e/core/card-view/aspect-oriented-config.e2e.ts index c42a5747c1..a2b9cc9f19 100644 --- a/e2e/core/card-view/aspect-oriented-config.e2e.ts +++ b/e2e/core/card-view/aspect-oriented-config.e2e.ts @@ -20,7 +20,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; import CardViewPage = require('../../pages/adf/metadataViewPage'); -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ConfigEditorPage } from '../../pages/adf/configEditorPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts index 6975e875cd..d1be782d34 100644 --- a/e2e/core/card-view/card-view-component.e2e.ts +++ b/e2e/core/card-view/card-view-component.e2e.ts @@ -18,7 +18,8 @@ import { element, by } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; + import CardViewPage = require('../../pages/adf/metadataViewPage'); import TestConfig = require('../../test.config'); diff --git a/e2e/core/card-view/metadata-permissions.e2e.ts b/e2e/core/card-view/metadata-permissions.e2e.ts index 775043a36c..5abd4e920a 100644 --- a/e2e/core/card-view/metadata-permissions.e2e.ts +++ b/e2e/core/card-view/metadata-permissions.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '../../pages/adf/loginPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; import CardViewPage = require('../../pages/adf/metadataViewPage'); -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import AcsUserModel = require('../../models/ACS/acsUserModel'); import FileModel = require('../../models/ACS/fileModel'); diff --git a/e2e/core/header_component.e2e.ts b/e2e/core/header_component.e2e.ts index f3a4014c75..05020869e7 100644 --- a/e2e/core/header_component.e2e.ts +++ b/e2e/core/header_component.e2e.ts @@ -15,7 +15,8 @@ * limitations under the License. */ import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; + import { HeaderPage } from '../pages/adf/core/headerPage'; import { SettingsPage } from '../pages/adf/settingsPage'; import TestConfig = require('../test.config'); diff --git a/e2e/core/login/login_component.e2e.ts b/e2e/core/login/login_component.e2e.ts index 4c440a0122..70f5556501 100644 --- a/e2e/core/login/login_component.e2e.ts +++ b/e2e/core/login/login_component.e2e.ts @@ -20,7 +20,8 @@ import { browser } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ProcessServicesPage } from '../../pages/adf/process_services/processServicesPage'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; + import { UserInfoDialog } from '../../pages/adf/dialog/userInfoDialog'; import TestConfig = require('../../test.config'); diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index c59fb0286e..1953d6ed40 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -20,7 +20,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../../pages/adf/loginPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ProcessServicesPage } from '../../pages/adf/process_services/processServicesPage'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import TestConfig = require('../../test.config'); import AcsUserModel = require('../../models/ACS/acsUserModel'); diff --git a/e2e/core/theming_component.e2e.ts b/e2e/core/theming_component.e2e.ts index b896bc24cd..76b4038c09 100644 --- a/e2e/core/theming_component.e2e.ts +++ b/e2e/core/theming_component.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); diff --git a/e2e/core/user_info_component.e2e.ts b/e2e/core/user_info_component.e2e.ts index 003ab4e9c8..b626d394b2 100644 --- a/e2e/core/user_info_component.e2e.ts +++ b/e2e/core/user_info_component.e2e.ts @@ -18,7 +18,7 @@ import { SettingsPage } from '../pages/adf/settingsPage'; import { LoginPage } from '../pages/adf/loginPage'; import { UserInfoDialog } from '../pages/adf/dialog/userInfoDialog'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import AcsUserModel = require('../models/ACS/acsUserModel'); import FileModel = require('../models/ACS/fileModel'); diff --git a/e2e/core/viewer/viewer_component.e2e.ts b/e2e/core/viewer/viewer_component.e2e.ts index 1046c618cb..4686054332 100644 --- a/e2e/core/viewer/viewer_component.e2e.ts +++ b/e2e/core/viewer/viewer_component.e2e.ts @@ -19,7 +19,7 @@ import TestConfig = require('../../test.config'); import { LoginPage } from '../../pages/adf/loginPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; -import NavigationBarPage = require('../../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import resources = require('../../util/resources'); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index 60de209283..819861f82e 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import AnalyticsPage = require('../pages/adf/process_services/analyticsPage'); import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts index faa2073a40..7c75ca9ed3 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/contentServicesPage.ts @@ -19,7 +19,8 @@ import Util = require('../../util/util'); import ContentList = require('./dialog/contentList'); import CreateFolderDialog = require('./dialog/createFolderDialog'); import TestConfig = require('../../test.config'); -import NavigationBarPage = require('./navigationBarPage'); +import { NavigationBarPage } from './navigationBarPage'; + import path = require('path'); export class ContentServicesPage { diff --git a/e2e/pages/adf/navigationBarPage.js b/e2e/pages/adf/navigationBarPage.js deleted file mode 100644 index 1b756ea88e..0000000000 --- a/e2e/pages/adf/navigationBarPage.js +++ /dev/null @@ -1,163 +0,0 @@ -/*! - * @license - * Copyright 2016 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. - */ - -var Util = require('../../util/util'); -var TestConfig = require('../../test.config'); - -var NavigationBarPage = function () { - - var contentServicesButton = element(by.css("a[data-automation-id='Content Services']")); - var configEditoButton = element(by.css("a[data-automation-id='Configuration Editor']")); - var processServicesButton = element(by.css("a[data-automation-id='Process Services']")); - var loginButton = element(by.css("a[data-automation-id='Login']")); - var trashcanButton = element(by.css("a[data-automation-id='Trashcan']")); - var userProfileButton = element(by.css("button[data-automation-id='adf-user-profile']")); - var themeButton = element(by.css("button[data-automation-id='theme menu']")); - var themeMenuContent = element(by.css("div[class*='mat-menu-panel']")); - var logoutButton = element(by.css("a[adf-logout]")); - var cardViewButton = element(by.cssContainingText(".sidenav-menu-label", "CardView")); - var languageMenuButton = element(by.css('button[data-automation-id="language-menu-button"]')); - var appTitle = element(by.css('.adf-app-title')); - var headerDataButton = element(by.css("a[data-automation-id='Header Data']")); - var menuButton = element(by.css('button[data-automation-id="adf-menu-icon"]')); - - this.clickContentServicesButton = function () { - Util.waitUntilElementIsVisible(contentServicesButton); - contentServicesButton.click(); - }; - - this.clickConfigEditorButton = function () { - Util.waitUntilElementIsVisible(configEditoButton); - configEditoButton.click(); - }; - - this.clickProcessServicesButton = function () { - Util.waitUntilElementIsVisible(processServicesButton); - processServicesButton.click(); - }; - - this.clickLoginButton = function () { - Util.waitUntilElementIsVisible(loginButton); - loginButton.click(); - }; - - this.clickTrashcanButton = function () { - Util.waitUntilElementIsVisible(trashcanButton); - trashcanButton.click(); - }; - - this.clickUserProfile = function () { - Util.waitUntilElementIsVisible(userProfileButton); - userProfileButton.click(); - }; - - this.clickThemeButton = function () { - Util.waitUntilElementIsVisible(themeButton); - themeButton.click(); - Util.waitUntilElementIsVisible(themeMenuContent); - }; - - this.clickOnSpecificThemeButton = function (themeName) { - var themeElement = element(by.css("button[data-automation-id='" + themeName + "']")); - Util.waitUntilElementIsVisible(themeElement); - Util.waitUntilElementIsClickable(themeElement); - themeElement.click(); - }; - - /** - * Click Logout Button - * @method clickLogoutButton - */ - this.clickLogoutButton = function () { - Util.waitUntilElementIsVisible(logoutButton); - logoutButton.click(); - }; - - /** - * Click Card View Button - * @method clickCardViewButton - */ - this.clickCardViewButton = function () { - Util.waitUntilElementIsVisible(cardViewButton); - cardViewButton.click(); - }; - - /** - * Click Card View Button - * @method clickCardViewButton - */ - this.openContentServicesFolder = function (folderId) { - return browser.get(TestConfig.adf.url + '/files/' + folderId); - }; - - this.chooseLanguage = function(language) { - let buttonLanguage = element(by.xpath(`//adf-language-menu//button[contains(text(), '${language}')]`)); - Util.waitUntilElementIsVisible(buttonLanguage); - buttonLanguage.click(); - }; - - this.openLanguageMenu = function () { - Util.waitUntilElementIsVisible(languageMenuButton); - languageMenuButton.click(); - Util.waitUntilElementIsVisible(appTitle); - }; - - this.clickHeaderDataButton = function () { - Util.waitUntilElementIsVisible(headerDataButton); - Util.waitUntilElementIsClickable(headerDataButton); - return headerDataButton.click(); - }; - - this.checkMenuButtonIsDisplayed = function () { - return Util.waitUntilElementIsVisible(menuButton); - }; - - this.checkMenuButtonIsNotDisplayed = function () { - return Util.waitUntilElementIsNotVisible(menuButton); - }; - - this.checkToolbarColor = function (color) { - var toolbarColor = element(by.css(`mat-toolbar[class*="mat-${color}"]`)); - return Util.waitUntilElementIsVisible(toolbarColor); - }; - - this.clickAppLogo = function (logoTitle) { - var appLogo = element(by.css('a[title="'+ logoTitle +'"]')); - Util.waitUntilElementIsVisible(appLogo); - appLogo.click(); - }; - - this.clickAppLogoText = function () { - Util.waitUntilElementIsVisible(appTitle); - appTitle.click(); - }; - - this.openViewer = function (nodeId) { - browser.get(TestConfig.adf.url + `/files(overlay:files/${nodeId}/view`); - return this; - }; - - this.goToSite = function (site) { - browser.get(TestConfig.adf.url + `/files/${site.entry.guid}/display/list`); - }; - - this.checkContentServicesButtonIsDisplayed = function () { - Util.waitUntilElementIsVisible(contentServicesButton); - }; -}; - -module.exports = NavigationBarPage; diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigationBarPage.ts new file mode 100644 index 0000000000..5510764ba6 --- /dev/null +++ b/e2e/pages/adf/navigationBarPage.ts @@ -0,0 +1,150 @@ +/*! + * @license + * Copyright 2016 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 Util = require('../../util/util'); +import TestConfig = require('../../test.config'); + +export class NavigationBarPage { + + contentServicesButton = element(by.css('a[data-automation-id="Content Services"]')); + configEditorButton = element(by.css('a[data-automation-id="Configuration Editor"]')); + processServicesButton = element(by.css('a[data-automation-id="Process Services"]')); + loginButton = element(by.css('a[data-automation-id="Login"]')); + trashcanButton = element(by.css('a[data-automation-id="Trashcan"]')); + userProfileButton = element(by.css('button[data-automation-id="adf-user-profile"]')); + themeButton = element(by.css('button[data-automation-id="theme menu"]')); + themeMenuContent = element(by.css('div[class*="mat-menu-panel"]')); + logoutButton = element(by.css('a[adf-logout]')); + cardViewButton = element(by.cssContainingText('.sidenav-menu-label', 'CardView')); + languageMenuButton = element(by.css('button[data-automation-id="language-menu-button"]')); + appTitle = element(by.css('.adf-app-title')); + headerDataButton = element(by.css('a[data-automation-id="Header Data"]')); + menuButton = element(by.css('button[data-automation-id="adf-menu-icon"]')); + + clickContentServicesButton() { + Util.waitUntilElementIsVisible(this.contentServicesButton); + this.contentServicesButton.click(); + } + + clickConfigEditorButton() { + Util.waitUntilElementIsVisible(this.configEditorButton); + this.configEditorButton.click(); + } + + clickProcessServicesButton() { + Util.waitUntilElementIsVisible(this.processServicesButton); + this.processServicesButton.click(); + } + + clickLoginButton() { + Util.waitUntilElementIsVisible(this.loginButton); + this.loginButton.click(); + } + + clickTrashcanButton() { + Util.waitUntilElementIsVisible(this.trashcanButton); + this.trashcanButton.click(); + } + + clickUserProfile() { + Util.waitUntilElementIsVisible(this.userProfileButton); + this.userProfileButton.click(); + } + + clickThemeButton() { + Util.waitUntilElementIsVisible(this.themeButton); + this.themeButton.click(); + Util.waitUntilElementIsVisible(this.themeMenuContent); + } + + clickOnSpecificThemeButton(themeName) { + let themeElement = element(by.css(`button[data-automation-id="${themeName}"]`)); + Util.waitUntilElementIsVisible(themeElement); + Util.waitUntilElementIsClickable(themeElement); + themeElement.click(); + } + + clickLogoutButton() { + Util.waitUntilElementIsVisible(this.logoutButton); + this.logoutButton.click(); + } + + clickCardViewButton() { + Util.waitUntilElementIsVisible(this.cardViewButton); + this.cardViewButton.click(); + } + + openContentServicesFolder(folderId) { + return browser.get(TestConfig.adf.url + '/files/' + folderId); + } + + chooseLanguage(language) { + let buttonLanguage = element(by.xpath(`//adf-language-menu//button[contains(text(), '${language}')]`)); + Util.waitUntilElementIsVisible(buttonLanguage); + buttonLanguage.click(); + } + + openLanguageMenu() { + Util.waitUntilElementIsVisible(this.languageMenuButton); + this.languageMenuButton.click(); + Util.waitUntilElementIsVisible(this.appTitle); + } + + clickHeaderDataButton() { + Util.waitUntilElementIsVisible(this.headerDataButton); + Util.waitUntilElementIsClickable(this.headerDataButton); + return this.headerDataButton.click(); + } + + checkMenuButtonIsDisplayed() { + return Util.waitUntilElementIsVisible(this.menuButton); + } + + checkMenuButtonIsNotDisplayed() { + return Util.waitUntilElementIsNotVisible(this.menuButton); + } + + checkToolbarColor(color) { + let toolbarColor = element(by.css(`mat-toolbar[class*="mat-${color}"]`)); + return Util.waitUntilElementIsVisible(toolbarColor); + } + + clickAppLogo(logoTitle) { + let appLogo = element(by.css('a[title="' + logoTitle + '"]')); + Util.waitUntilElementIsVisible(appLogo); + appLogo.click(); + } + + clickAppLogoText() { + Util.waitUntilElementIsVisible(this.appTitle); + this.appTitle.click(); + } + + checkLogoTooltip(logoTooltip) { + let logoTooltip = element(by.css('a[title="' + logoTooltip + '"]')); + Util.waitUntilElementIsVisible(logoTooltip); + } + + openViewer(nodeId) { + browser.get(TestConfig.adf.url + `/files(overlay:files/${nodeId}/view`); + return this; + } + + goToSite(site) { + browser.get(TestConfig.adf.url + `/files/${site.entry.guid}/display/list`); + } +} diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index f2fa5ecd3f..22f7cd8593 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/custom_process_filters.e2e.ts b/e2e/process-services/custom_process_filters.e2e.ts index 43beb84e09..c7a816c2f8 100644 --- a/e2e/process-services/custom_process_filters.e2e.ts +++ b/e2e/process-services/custom_process_filters.e2e.ts @@ -20,7 +20,6 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); -import FiltersPage = require('../pages/adf/process_services/filtersPage'); import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; import { AppSettingsToggles } from '../pages/adf/process_services/dialog/appSettingsToggles'; diff --git a/e2e/process-services/empty_process_list_component.e2e.ts b/e2e/process-services/empty_process_list_component.e2e.ts index f06dfc39e9..0efdc06f97 100644 --- a/e2e/process-services/empty_process_list_component.e2e.ts +++ b/e2e/process-services/empty_process_list_component.e2e.ts @@ -18,7 +18,7 @@ import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); diff --git a/e2e/process-services/process_filters_component.e2e.ts b/e2e/process-services/process_filters_component.e2e.ts index b7857df11b..d143f5c34d 100644 --- a/e2e/process-services/process_filters_component.e2e.ts +++ b/e2e/process-services/process_filters_component.e2e.ts @@ -18,7 +18,8 @@ import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; + import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import StartProcessPage = require('../pages/adf/process_services/startProcessPage'); import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); diff --git a/e2e/process-services/start_process_component.e2e.ts b/e2e/process-services/start_process_component.e2e.ts index bed2ce1bce..5c3330fe37 100644 --- a/e2e/process-services/start_process_component.e2e.ts +++ b/e2e/process-services/start_process_component.e2e.ts @@ -20,7 +20,7 @@ import TestConfig = require('../test.config'); import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import StartProcessPage = require('../pages/adf/process_services/startProcessPage'); import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); @@ -30,14 +30,12 @@ import { AttachmentListPage } from '../pages/adf/process_services/attachmentList import { AppsActions } from '../actions/APS/apps.actions'; import User = require('../models/APS/User'); -import AppPublish = require('../models/APS/AppPublish'); import Tenant = require('../models/APS/Tenant'); import FileModel = require('../models/ACS/fileModel'); import dateFormat = require('dateformat'); import AlfrescoApi = require('alfresco-js-api-node'); -import fs = require('fs'); import path = require('path'); describe('Start Process Component', () => { diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts index f0cbd95cf2..8fa8528822 100644 --- a/e2e/process-services/task_filters_component.e2e.ts +++ b/e2e/process-services/task_filters_component.e2e.ts @@ -19,7 +19,7 @@ import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import TasksListPage = require('../pages/adf/process_services/tasksListPage'); diff --git a/e2e/process-services/task_filters_sorting.e2e.ts b/e2e/process-services/task_filters_sorting.e2e.ts index c78d675258..3ddb299e48 100644 --- a/e2e/process-services/task_filters_sorting.e2e.ts +++ b/e2e/process-services/task_filters_sorting.e2e.ts @@ -18,7 +18,7 @@ import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '../pages/adf/loginPage'; -import NavigationBarPage = require('../pages/adf/navigationBarPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import TasksListPage = require('../pages/adf/process_services/tasksListPage');