inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-1843] tomcat e2e runs (#674)

Browse Source 
* tomcat environment

* disable artifact deployment for now

* travis settings update

* protractor settings

* protractor settings

* e2e fixes

* e2e fixes

* [ACA-1842] fix library dialog

* cleanup travis settings

* disable test (bug raised)

* fix after rebase

* fix after rebase
This commit is contained in:
Denys Vuika
2018-09-29 11:21:38 +01:00
committed by GitHub
parent 25e6f15ffc
commit 93e6489881
15 changed files with 267 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/pages/page.ts
View File

@@ -31,11 +31,9 @@ import {
promise,
ExpectedConditions as EC
} from 'protractor';
import { BROWSER_WAIT_TIMEOUT } from './../configs';
import { BROWSER_WAIT_TIMEOUT, USE_HASH_STRATEGY } from './../configs';
export abstract class Page {
private static USE_HASH_STRATEGY = true;
private locators = {
app: by.css('app-root'),
layout: by.css('app-layout'),
@@ -69,8 +67,8 @@ export abstract class Page {
}
load(relativeUrl: string = ''): promise.Promise<void> {
const hash = Page.USE_HASH_STRATEGY ? '/#' : '';
const path = `${hash}${this.url}${relativeUrl}`;
const hash = USE_HASH_STRATEGY ? '/#' : '';
const path = `${browser.baseUrl}${hash}${this.url}${relativeUrl}`;
return browser.get(path);
}