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

Unify hash url strategy (#5866)

Browse Source 
* unify hash url startegy

* improve
This commit is contained in:
Eugenio Romano
2020-07-14 16:00:32 +01:00
committed by GitHub
parent 8ac683d164
commit d1672596ba
182 changed files with 476 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/core/datatable/data-table-component-selection.e2e.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { ApiService, DataTableComponentPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -26,7 +26,7 @@ describe('Datatable component - selection', () => {
const usersActions = new UsersActions(apiService);
const dataTablePage = new DataTablePage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const acsUser = new UserModel();
const navigationBarPage = new NavigationBarPage();
const dataTableComponent = new DataTableComponentPage();

4
e2e/core/datatable/data-table-component.e2e.ts
View File

@@ -18,7 +18,7 @@
import {
ApiService,
DropActions,
LoginSSOPage,
LoginPage,
NotificationHistoryPage,
UserModel,
UsersActions
@@ -33,7 +33,7 @@ describe('Datatable component', () => {
const dataTablePage = new DataTablePage('defaultTable');
const copyContentDataTablePage = new DataTablePage('copyClipboardDataTable');
const dragAndDropDataTablePage = new DataTablePage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const acsUser = new UserModel();
const navigationBarPage = new NavigationBarPage();
const notificationHistoryPage = new NotificationHistoryPage();

10
e2e/core/error-component.e2e.ts
View File

@@ -15,14 +15,14 @@
* limitations under the License.
*/
import { ApiService, BrowserActions, ErrorPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ApiService, BrowserActions, ErrorPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
describe('Error Component', () => {
const acsUser = new UserModel();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const errorPage = new ErrorPage();
const navigationBarPage = new NavigationBarPage();
@@ -40,21 +40,21 @@ describe('Error Component', () => {
});
it('[C277302] Should display the error 403 when access to unauthorized page - My Change', async () => {
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403');
await BrowserActions.getUrl(browser.baseUrl + '/error/403');
await expect(await errorPage.getErrorCode()).toBe('403');
await expect(await errorPage.getErrorTitle()).toBe('You don\'t have permission to access this server.');
await expect(await errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
});
it('[C277304] Should display the error 404 when access to not found page', async () => {
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404');
await BrowserActions.getUrl(browser.baseUrl + '/error/404');
await expect(await errorPage.getErrorCode()).toBe('404');
await expect(await errorPage.getErrorTitle()).toBe('An error occurred.');
await expect(await errorPage.getErrorDescription()).toBe('We couldn’t find the page you were looking for.');
});
it('[C307029] Should display Unknown message when error is undefined', async () => {
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/501');
await BrowserActions.getUrl(browser.baseUrl + '/error/501');
await expect(await errorPage.getErrorCode()).toBe('UNKNOWN');
await expect(await errorPage.getErrorTitle()).toBe('We hit a problem.');
await expect(await errorPage.getErrorDescription()).toBe('Looks like something went wrong.');

4
e2e/core/header-component.e2e.ts
View File

@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { ApiService, HeaderPage, LoginSSOPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ApiService, HeaderPage, LoginPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
describe('Header Component', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const headerPage = new HeaderPage();
const settingsPage = new SettingsPage();

4
e2e/core/icons-component.e2e.ts
View File

@@ -15,14 +15,14 @@
* limitations under the License.
*/
import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { IconsPage } from '../pages/adf/icons.page';
import { browser } from 'protractor';
describe('Universal Icon component', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const acsUser = new UserModel();
const navigationBarPage = new NavigationBarPage();
const iconsPage = new IconsPage();

4
e2e/core/infinite-scrolling.e2e.ts
View File

@@ -18,7 +18,7 @@
import {
ApiService,
LocalStorageUtil,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -32,7 +32,7 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
describe('Enable infinite scrolling', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const infinitePaginationPage = new InfinitePaginationPage();
const navigationBarPage = new NavigationBarPage();

12
e2e/core/login/login-component.e2e.ts
View File

@@ -28,7 +28,7 @@ import { browser } from 'protractor';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page';
import { LoginPage } from '../../pages/adf/demo-shell/login.page';
import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
describe('Login component', () => {
@@ -36,7 +36,7 @@ describe('Login component', () => {
const navigationBarPage = new NavigationBarPage();
const userInfoPage = new UserInfoPage();
const contentServicesPage = new ContentServicesPage();
const loginPage = new LoginPage();
const loginPage = new LoginShellPage();
const errorPage = new ErrorPage();
const userA = new UserModel();
@@ -192,7 +192,7 @@ describe('Login component', () => {
await loginPage.goToLoginPage();
await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await browser.executeScript('window.localStorage.removeItem("ADF_ticket-ECM");');
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
await BrowserActions.getUrl(browser.baseUrl + '/files');
await loginPage.waitForElements();
await LocalStorageUtil.setStorageItem('providers', 'ALL');
@@ -210,7 +210,7 @@ describe('Login component', () => {
await loginPage.goToLoginPage();
await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
await browser.executeScript('window.localStorage.removeItem("ADF_ticket-BPM");');
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await loginPage.waitForElements();
});
@@ -222,9 +222,9 @@ describe('Login component', () => {
const handles = await browser.getAllWindowHandles();
await browser.switchTo().window(handles[1]);
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await processServicesPage.checkApsContainer();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
await BrowserActions.getUrl(browser.baseUrl + '/files');
await contentServicesPage.checkAcsContainer();
});

8
e2e/core/login/login-sso/login-sso.e2e.ts
View File

@@ -15,16 +15,16 @@
* limitations under the License.
*/
import { LoginSSOPage, SettingsPage, BrowserVisibility } from '@alfresco/adf-testing';
import { LoginPage, SettingsPage, BrowserVisibility } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page';
import { LoginPage } from '../../../pages/adf/demo-shell/login.page';
import { LoginShellPage } from '../../../pages/adf/demo-shell/login-shell.page';
describe('Login component - SSO', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage();
const loginPage = new LoginPage();
const loginSSOPage = new LoginPage();
const loginPage = new LoginShellPage();
const navigationBarPage = new NavigationBarPage();
describe('Login component - SSO implicit Flow', () => {

8
e2e/core/login/login-sso/logout-sso.e2e.ts
View File

@@ -15,18 +15,18 @@
* limitations under the License.
*/
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
import { LoginPage, SettingsPage } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page';
describe('Logout component - SSO', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage();
const loginSSOPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
it('[C280665] Should be possible change the logout redirect URL', async () => {
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost,
browser.params.testConfig.appConfig.oauth2.host,
browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId, '/login');
await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
@@ -35,6 +35,6 @@ describe('Logout component - SSO', () => {
await browser.sleep(2000);
const actualUrl = await browser.getCurrentUrl();
await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/login');
await expect(actualUrl).toEqual(browser.baseUrl + '/login');
});
});

12
e2e/core/login/redirection.e2e.ts
View File

@@ -29,7 +29,7 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { LogoutPage } from '../../pages/adf/demo-shell/logout.page';
import { LoginPage } from '../../pages/adf/demo-shell/login.page';
import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
describe('Login component - Redirect', () => {
@@ -37,7 +37,7 @@ describe('Login component - Redirect', () => {
const processServicesPage = new ProcessServicesPage();
const navigationBarPage = new NavigationBarPage();
const contentServicesPage = new ContentServicesPage();
const loginPage = new LoginPage();
const loginPage = new LoginShellPage();
const logoutPage = new LogoutPage();
let user;
@@ -118,7 +118,7 @@ describe('Login component - Redirect', () => {
await navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
let actualUrl = await browser.getCurrentUrl();
await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
await contentServicesPage.waitForTableBody();
@@ -133,7 +133,7 @@ describe('Login component - Redirect', () => {
await loginPage.login(user.email, user.password);
actualUrl = await browser.getCurrentUrl();
await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
});
it('[C299161] Should redirect user to requested URL after reloading login page', async () => {
@@ -145,7 +145,7 @@ describe('Login component - Redirect', () => {
await navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
const currentUrl = await browser.getCurrentUrl();
await expect(currentUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
await expect(currentUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
await contentServicesPage.waitForTableBody();
@@ -165,6 +165,6 @@ describe('Login component - Redirect', () => {
await navigationBarPage.checkMenuButtonIsDisplayed();
const actualUrl = await browser.getCurrentUrl();
await expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
await expect(actualUrl).toEqual(browser.baseUrl + '/files/' + uploadedFolder.entry.id);
});
});

4
e2e/core/login/remember-me.e2e.ts
View File

@@ -16,12 +16,12 @@
*/
import { SettingsPage } from '@alfresco/adf-testing';
import { LoginPage } from '../../pages/adf/demo-shell/login.page';
import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page';
describe('Login component - Remember Me', () => {
const settingsPage = new SettingsPage();
const loginPage = new LoginPage();
const loginPage = new LoginShellPage();
beforeAll(async () => {
await loginPage.goToLoginPage();

4
e2e/core/notifications-component.e2e.ts
View File

@@ -15,14 +15,14 @@
* limitations under the License.
*/
import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NotificationDemoPage } from '../pages/adf/demo-shell/notification.page';
import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
describe('Notifications Component', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const notificationPage = new NotificationDemoPage();
const navigationBarPage = new NavigationBarPage();
const apiService = new ApiService();

4
e2e/core/pagination-empty-current-page.e2e.ts
View File

@@ -18,7 +18,7 @@
import {
ApiService,
ArrayUtil,
LoginSSOPage,
LoginPage,
PaginationPage,
StringUtil,
UploadActions,
@@ -33,7 +33,7 @@ import { ContentServicesPage } from '../pages/adf/content-services.page';
describe('Pagination - returns to previous page when current is empty', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const paginationPage = new PaginationPage();

12
e2e/core/settings-component.e2e.ts
View File

@@ -20,11 +20,11 @@ import { browser, protractor } from 'protractor';
import { ContentServicesPage } from '../pages/adf/content-services.page';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page';
import { LoginPage } from '../pages/adf/demo-shell/login.page';
import { LoginShellPage } from '../pages/adf/demo-shell/login-shell.page';
describe('Settings component', () => {
const loginPage = new LoginPage();
const loginPage = new LoginShellPage();
const settingsPage = new SettingsPage();
const navigationBarPage = new NavigationBarPage();
const processServicesPage = new ProcessServicesPage();
@@ -143,7 +143,7 @@ describe('Settings component', () => {
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
});
@@ -171,7 +171,7 @@ describe('Settings component', () => {
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
await BrowserActions.getUrl(browser.baseUrl + '/files');
await contentServicesPage.checkAcsContainer();
});
@@ -202,9 +202,9 @@ describe('Settings component', () => {
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
await BrowserActions.getUrl(browser.baseUrl + '/files');
await contentServicesPage.checkAcsContainer();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
});

6
e2e/core/user-info-component-cloud.e2e.ts
View File

@@ -15,13 +15,13 @@
* limitations under the License.
*/
import { ApiService, LoginSSOPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
import { ApiService, LoginPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
describe('User Info - SSO', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage();
const loginSSOPage = new LoginPage();
const userInfoPage = new UserInfoPage();
const apiService = new ApiService({ authType: 'OAUTH', provider: 'ECM' });
@@ -34,7 +34,7 @@ describe('User Info - SSO', () => {
identityUser = await usersActions.createUser();
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost,
browser.params.testConfig.appConfig.oauth2.host,
browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId);

4
e2e/core/user-info-component.e2e.ts
View File

@@ -16,7 +16,7 @@
*/
import { PeopleApi } from '@alfresco/js-api';
import { ApiService, LocalStorageUtil, LoginSSOPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
import { ApiService, LocalStorageUtil, LoginPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { FileModel } from '../models/ACS/file.model';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ import * as fs from 'fs';
describe('User Info component', () => {
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const userInfoPage = new UserInfoPage();
const navigationBarPage = new NavigationBarPage();

4
e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -33,7 +33,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();

4
e2e/core/viewer/file-extensions/viewer-component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -34,7 +34,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();

4
e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
let site;
const acsUser = new UserModel();

4
e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const apiService = new ApiService();

4
e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts
View File

@@ -17,7 +17,7 @@
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const apiService = new ApiService();

4
e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -32,7 +32,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const apiService = new ApiService();

4
e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -33,7 +33,7 @@ import CONSTANTS = require('../../../util/constants');
describe('Viewer', () => {
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const navigationBarPage = new NavigationBarPage();

4
e2e/core/viewer/info-drawer.component.e2e.ts
View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor';
import {
ApiService,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -34,7 +34,7 @@ describe('Info Drawer', () => {
const viewerPage = new ViewerPage();
const navigationBarPage = new NavigationBarPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const apiService = new ApiService();

4
e2e/core/viewer/viewer-content-services-component.e2e.ts
View File

@@ -16,7 +16,7 @@
*/
import { browser } from 'protractor';
import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ describe('Content Services Viewer', () => {
const acsUser = new UserModel();
const viewerPage = new ViewerPage();
const contentServicesPage = new ContentServicesPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
let zoom;

4
e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts
View File

@@ -16,7 +16,7 @@
*/
import { browser } from 'protractor';
import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
@@ -25,7 +25,7 @@ describe('Viewer', () => {
const navigationBarPage = new NavigationBarPage();
const viewerPage = new ViewerPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const apiService = new ApiService();

4
e2e/core/viewer/viewer-properties.e2e.ts
View File

@@ -19,7 +19,7 @@ import { browser } from 'protractor';
import {
ApiService,
DataTableComponentPage,
LoginSSOPage,
LoginPage,
UploadActions,
UserModel,
UsersActions,
@@ -34,7 +34,7 @@ describe('Viewer - properties', () => {
const acsUser = new UserModel();
const viewerPage = new ViewerPage();
const contentServicesPage = new ContentServicesPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const dataTable = new DataTableComponentPage();

12
e2e/core/viewer/viewer-share-content.ts
View File

@@ -18,7 +18,7 @@
import {
ApiService,
BrowserActions,
LoginSSOPage,
LoginPage,
StringUtil,
UploadActions,
UserModel,
@@ -36,7 +36,7 @@ describe('Viewer', () => {
const viewerPage = new ViewerPage();
const navigationBarPage = new NavigationBarPage();
const loginPage = new LoginSSOPage();
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const shareDialog = new ShareDialogPage();
@@ -97,11 +97,11 @@ describe('Viewer', () => {
});
it('[C260105] Should be able to open an image file shared via API', async () => {
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
await BrowserActions.getUrl(browser.baseUrl + '/preview/s/' + pngFileShared.entry.id);
await viewerPage.checkImgContainerIsDisplayed();
await BrowserActions.getUrl(browser.params.testConfig.adf.url);
await BrowserActions.getUrl(browser.baseUrl);
await navigationBarPage.clickLogoutButton();
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
await BrowserActions.getUrl(browser.baseUrl + '/preview/s/' + pngFileShared.entry.id);
await viewerPage.checkImgContainerIsDisplayed();
});
@@ -119,7 +119,7 @@ describe('Viewer', () => {
await viewerPage.checkFileIsLoaded();
await viewerPage.checkFileNameIsDisplayed(wordFileInfo.name);
await BrowserActions.getUrl(browser.params.testConfig.adf.url);
await BrowserActions.getUrl(browser.baseUrl);
await navigationBarPage.clickLogoutButton();
await BrowserActions.getUrl(sharedLink);
await viewerPage.checkFileIsLoaded();