diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts deleted file mode 100644 index 241144a2af..0000000000 --- a/e2e/core/header-component.e2e.ts +++ /dev/null @@ -1,123 +0,0 @@ -/*! - * @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 { ApiService, HeaderPage, LoginPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../core/pages/navigation-bar.page'; - -describe('Header Component', () => { - - const loginPage = new LoginPage(); - const navigationBarPage = new NavigationBarPage(); - const headerPage = new HeaderPage(); - const settingsPage = new SettingsPage(); - - const apiService = new ApiService(); - const usersActions = new UsersActions(apiService); - - const acsUser = new UserModel(); - - const names = { - app_title_default: 'ADF Demo Application', - app_title_custom: 'New Test App', - urlPath_default: './assets/images/logo.png', - urlPath_custom: 'https://upload.wikimedia.org/wikipedia/commons/b/ba/Flower_jtca001.jpg', - urlPath_logo_link: '"/settings-layout"', - color_primary: 'primary', - color_accent: 'accent', - color_warn: 'warn', - color_custom: '#862B2B', - logo_title: 'ADF Demo Application', - logo_tooltip: 'test_tooltip' - }; - - beforeAll(async () => { - await apiService.loginWithProfile('admin'); - - await usersActions.createUser(acsUser); - await loginPage.login(acsUser.username, acsUser.password); - }); - - beforeEach(async () => { - await navigationBarPage.clickHeaderDataButton(); - }); - - it('[C280002] Should be able to view Header component', async () => { - await headerPage.checkShowMenuCheckBoxIsDisplayed(); - await headerPage.checkChooseHeaderColourIsDisplayed(); - await headerPage.checkHexColorInputIsDisplayed(); - await headerPage.checkChangeTitleIsDisplayed(); - await headerPage.checkChangeUrlPathIsDisplayed(); - await headerPage.checkLogoHyperlinkInputIsDisplayed(); - await headerPage.checkLogoTooltipInputIsDisplayed(); - }); - - it('[C279996] Should be able to show/hide menu button', async () => { - await headerPage.clickShowMenuButton(); - await navigationBarPage.checkMenuButtonIsNotDisplayed(); - await headerPage.clickShowMenuButton(); - await navigationBarPage.checkMenuButtonIsDisplayed(); - }); - - it('[C279999] Should be able to change the colour between primary, accent and warn', async () => { - await headerPage.changeHeaderColor(names.color_accent); - await navigationBarPage.checkToolbarColor(names.color_accent); - await headerPage.changeHeaderColor(names.color_primary); - await navigationBarPage.checkToolbarColor(names.color_primary); - await headerPage.changeHeaderColor(names.color_warn); - await navigationBarPage.checkToolbarColor(names.color_warn); - }); - - it('[C280552] Should be able to change the colour of the header by typing a hex code', async () => { - await headerPage.addHexCodeColor(names.color_custom); - await navigationBarPage.checkToolbarColor(names.color_custom); - }); - - it('[C279997] Should be able to change the title of the app', async () => { - await headerPage.checkAppTitle(names.app_title_default); - await headerPage.addTitle(names.app_title_custom); - await headerPage.checkAppTitle(names.app_title_custom); - }); - - it('[C279998] Should be able to change the default logo of the app', async () => { - await headerPage.checkIconIsDisplayed(names.urlPath_default); - await headerPage.addIcon(names.urlPath_custom); - await headerPage.checkIconIsDisplayed(names.urlPath_custom); - }); - - it('[C280553] Should be able to set a hyperlink to the logo', async () => { - await headerPage.addLogoHyperlink(names.urlPath_logo_link); - await navigationBarPage.clickAppLogo(names.logo_title); - await settingsPage.checkProviderDropdownIsDisplayed(); - }); - - it('[C286517] Should be able to set a hyperlink to the logo text', async () => { - await headerPage.addLogoHyperlink(names.urlPath_logo_link); - await navigationBarPage.clickAppLogoText(); - await settingsPage.checkProviderDropdownIsDisplayed(); - }); - - it('[C280554] Should be able to customise the tooltip-text of the logo', async () => { - await headerPage.addLogoTooltip(names.logo_tooltip); - await navigationBarPage.checkLogoTooltip(names.logo_tooltip); - }); - - it('[C286297] Should be able to change the position of the sidebar menu', async () => { - await headerPage.sideBarPositionEnd(); - await headerPage.checkSidebarPositionEnd(); - await headerPage.sideBarPositionStart(); - await headerPage.checkSidebarPositionStart(); - }); -}); diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts deleted file mode 100644 index 6a3d091f39..0000000000 --- a/e2e/core/icons-component.e2e.ts +++ /dev/null @@ -1,51 +0,0 @@ -/*! - * @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 { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../core/pages/navigation-bar.page'; -import { IconsPage } from '../core/pages/icons.page'; - -describe('Universal Icon component', () => { - - const loginPage = new LoginPage(); - const acsUser = new UserModel(); - const navigationBarPage = new NavigationBarPage(); - const iconsPage = new IconsPage(); - - const apiService = new ApiService(); - const usersActions = new UsersActions(apiService); - - beforeAll(async () => { - await apiService.loginWithProfile('admin'); - await usersActions.createUser(acsUser); - await loginPage.login(acsUser.username, acsUser.password); - }); - - afterAll(async () => { - await navigationBarPage.clickLogoutButton(); - }); - - beforeEach(async () => { - await navigationBarPage.clickIconsButton(); - }); - - it('[C291872] Should display the icons on the page', async () => { - await expect(await iconsPage.isLigatureIconDisplayed('folder')).toBe(true, 'Ligature icon is not displayed'); - await expect(await iconsPage.isCustomIconDisplayed('adf:move_file')).toBe(true, 'Named icon is not displayed'); - await expect(await iconsPage.isCustomIconDisplayed('adf:folder')).toBe(true, 'Thumbnail service icon is not displayed'); - }); -}); diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index eb1289cc61..7772308997 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -27,12 +27,10 @@ import { import { browser } from 'protractor'; import { ContentServicesPage } from '../../core/pages/content-services.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { ProcessServicesPage } from '../../process-services/pages/process-services.page'; import { LoginShellPage } from '../../core/pages/login-shell.page'; describe('Login component', () => { - const processServicesPage = new ProcessServicesPage(); const navigationBarPage = new NavigationBarPage(); const userInfoPage = new UserInfoPage(); const contentServicesPage = new ContentServicesPage(); @@ -155,18 +153,6 @@ describe('Login component', () => { await loginPage.checkRegisterIsNotDisplayed(); }); - it('[C260049] Should be possible to login to Process Services with Content Services disabled', async () => { - await LocalStorageUtil.setStorageItem('providers', 'BPM'); - - await loginPage.goToLoginPage(); - await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); - await loginPage.loginWithProfile('admin'); - await navigationBarPage.navigateToProcessServicesPage(); - await processServicesPage.checkApsContainer(); - await navigationBarPage.navigateToContentServices(); - await loginPage.waitForElements(); - }); - it('[C260050] Should be possible to login to Content Services with Process Services disabled', async () => { await LocalStorageUtil.setStorageItem('providers', 'ECM'); @@ -177,20 +163,6 @@ describe('Login component', () => { await contentServicesPage.checkAcsContainer(); }); - it('[C260051] Should be able to login to both Content Services and Process Services', async () => { - await LocalStorageUtil.setStorageItem('providers', 'ALL'); - - await loginPage.goToLoginPage(); - await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); - await loginPage.loginWithProfile('admin'); - await navigationBarPage.navigateToProcessServicesPage(); - await processServicesPage.checkApsContainer(); - await navigationBarPage.navigateToContentServices(); - await contentServicesPage.checkAcsContainer(); - await navigationBarPage.clickLoginButton(); - await loginPage.waitForElements(); - }); - it('[C277754] Should the user be redirect to the login page when the Content Service session expire', async () => { await LocalStorageUtil.setStorageItem('providers', 'ECM'); @@ -203,36 +175,6 @@ describe('Login component', () => { await LocalStorageUtil.setStorageItem('providers', 'ALL'); }); - it('[C279932] Should successRoute property change the landing page when the user Login', async () => { - await loginPage.goToLoginPage(); - await loginPage.enableSuccessRouteSwitch(); - await loginPage.enterSuccessRoute('activiti'); - await loginPage.loginWithProfile('admin'); - await processServicesPage.checkApsContainer(); - }); - - it('[C279931] Should the user be redirect to the login page when the Process Service session expire', async () => { - await loginPage.goToLoginPage(); - await loginPage.loginWithProfile('admin'); - await browser.executeScript('window.localStorage.removeItem("ADF_ticket-BPM");'); - await BrowserActions.getUrl(browser.baseUrl + '/activiti'); - await loginPage.waitForElements(); - }); - - it('[C279930] Should a user still be logged-in when open a new tab', async () => { - await loginPage.goToLoginPage(); - await loginPage.loginWithProfile('admin'); - - await browser.executeScript("window.open('about: blank', '_blank');"); - - const handles = await browser.getAllWindowHandles(); - await browser.switchTo().window(handles[1]); - await BrowserActions.getUrl(browser.baseUrl + '/activiti'); - await processServicesPage.checkApsContainer(); - await BrowserActions.getUrl(browser.baseUrl + '/files'); - await contentServicesPage.checkAcsContainer(); - }); - it('[C279933] Should be possible change the login component logo when logoImageUrl is changed', async () => { await loginPage.goToLoginPage(); await loginPage.enableLogoSwitch(); diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json index e2bdc324ae..753f856427 100644 --- a/e2e/protractor.excludes.json +++ b/e2e/protractor.excludes.json @@ -1,9 +1,4 @@ { - "C260049": "login problem APS not basic", - "C260051": "login problem APS not basic", - "C279932": "login problem APS not basic", - "C279931": "login problem APS not basic", - "C279930": "login problem APS not basic", "C269081": "https://alfresco.atlassian.net/browse/ADF-5385", "C272819": "https://alfresco.atlassian.net/browse/ADF-5385", "C290069": "https://alfresco.atlassian.net/browse/ADF-5387",